[automerger skipped] Align /data partition rules with vts_fs_test. am: 59f2b11c48 am: ce33cdcb3e am: 0e6e0b6fcb am: 95867022b5 -s ours am: 8f6d300ba9 -s ours am: 020f8871d5 -s ours am: 6d2e4841be -s ours am skip reason: Merged-In Iafaa370b732457bf1ba1dcabfb63c2490ad1f176 with SHA-1 59f2b11c48 is already in history Original change: https://android-review.googlesource.com/c/platform/system/gsid/+/3048275 Change-Id: I457276081e2b0c5e1fd717a3bbf6cd1d08926a9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>