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

am skip reason: skipped by user robinjacob

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

Change-Id: I6d75452be9b1180e4427ecce161162925c5ed6c7