Merge changes from topic "am-95940dd28b45460c9c802f3a2e5d9e45"

* changes:
  Merge changes from topic "am-56a36b85247f48f2b332b1b854fde2ae" into android12L-tests-dev am: 4e2b1d0293
  [automerger skipped] Merge "VTS: Disable codec2 tests if platform does not support" into android11-tests-dev am: 87bcb22f7b -s ours am: e9acc2d59c -s ours am: 6a55c5bbfa -s ours