Merge "[automerger skipped] Merge "Extend test timeout for VtsFiemapWriterTest" into android10-tests-dev am: 50037a6212 -s ours" into android11-tests-dev am: 089db75bde

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

Change-Id: If182457e7ab08f1bbee4b71d8318636e43c4011e