[automerger skipped] Merge "vts_fs_test: Relax filesystem constraints for...

[automerger skipped] Merge "vts_fs_test: Relax filesystem constraints for fixed partitions." into udc-dev am: 7f5512dc -s ours

am skip reason: Merged-In I5bd874f68296f7155d8c4366ebc13fe3d59c3ee6 with SHA-1 084c94e4 is already in history

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



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