Merge changes from topic "am-7dbf291131af44a2ba18c9e135092781" into android12-tests-dev

* changes:
  Merge "[automerger skipped] Merge "Don't require bootloader fastboot for VTS compliance." into android10-tests-dev am: cd7a018917 -s ours" into android11-tests-dev am: 9a2f9eccc7
  [automerger skipped] Merge "Don't require bootloader fastboot for VTS compliance." into android10-tests-dev am: cd7a018917 -s ours am: 606088f724 -s ours