Merge "Extend test timeout for VtsFiemapWriterTest" into android10-tests-dev