[automerger skipped] Merge "Extend test timeout for VtsFiemapWriterTest" into...

[automerger skipped] Merge "Extend test timeout for VtsFiemapWriterTest" into android10-tests-dev am: 50037a62 -s ours am: 2b889498 -s ours am: c18b24e7 -s ours am: 75792a6e -s ours am: 036425ff -s ours

am skip reason: skipped by user robinjacob

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



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