Merge changes from topic "am-08a155ca62144e49bad1deffa5127df4"

* changes:
  Merge changes from topic "am-3e79d381eef4408781e0e24c77daba88" into android12L-tests-dev am: e5fdc5a93b
  [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 am: 5a3f06cb8b -s ours