Merge changes from topic "am-84249d1f96e94b83b4e6565a3a70a3c3" into android12-tests-dev

* changes:
  Merge changes from topic "am-824c45b1039f417598429adc4cef821a" into android11-tests-dev am: 6eaa3b48e9
  [automerger skipped] Merge "[DO NOT MERGE] Ignore AKISerialNumberTest in cts 9" into pie-cts-dev am: 0879cc86cf -s ours am: 10054e7519 -s ours am: daa5f16899 -s ours