[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 skip reason: skipped by user robinjacob

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



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