Merge changes from topic "am-e10973dc99fe42edb70aea8fe00dec21" into android13-tests-dev

* changes:
  Merge changes from topic "am-fc961e172efa4e06ae420c11fa7dce78" into android12L-tests-dev am: 756e78ff28 -s ours
  [automerger skipped] Merge "USB: Skip test if device doesn't support USB" into android12-tests-dev am: c8b2a6745a -s ours am: b1bc563bcb -s ours