Merge changes from topic "am-160c9f8b5caf40a2a0b6fae94210de90"

* changes:
  Merge changes from topic "am-eacec02142be4022b9d5a32720baa092" into android12L-tests-dev am: def183bea7
  [automerger skipped] Merge "Extend test timeout for VtsFiemapWriterTest" into android10-tests-dev am: 50037a6212 -s ours am: 2b889498a2 -s ours am: c18b24e749 -s ours am: 75792a6ec3 -s ours