[automerger skipped] Align /data partition rules with vts_fs_test. am: 59f2b11c48 am: 8a065645ab -s ours am: 84b64f657f -s ours

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

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

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