Merge "[automerger skipped] vts_fs_test: Only require EROFS in T+ kernels. am:...

Merge "[automerger skipped] vts_fs_test: Only require EROFS in T+ kernels. am: aee8ddbc am: 0375a89f -s ours am: 6dbae746 -s ours" into tm-d1-dev-plus-aosp am: d34951f0 -s ours am: 794502bd -s ours

am skip reason: Merged-In I294535953bfbe0f246347487b746d3adf2fca1aa with SHA-1 aee8ddbc is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/19293151



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