Merge changes from topic "am-3e79d381eef4408781e0e24c77daba88" into android12L-tests-dev

* changes:
  Merge changes from topic "am-7dbf291131af44a2ba18c9e135092781" into android12-tests-dev am: 80adc5a733
  [automerger skipped] Merge "Don't require bootloader fastboot for VTS compliance." into android10-tests-dev am: cd7a018917 -s ours am: 606088f724 -s ours am: c422e0a592 -s ours