[automerger skipped] Align /data partition rules with vts_fs_test. am:...

[automerger skipped] Align /data partition rules with vts_fs_test. am: 59f2b11c am: ce33cdcb am: 0e6e0b6f am: 95867022 -s ours am: 8f6d300b -s ours

am skip reason: Merged-In Iafaa370b732457bf1ba1dcabfb63c2490ad1f176 with SHA-1 59f2b11c is already in history

Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/3048275



Change-Id: I6943f97be1e3e74592fac306cc19e5a6968d3310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>