Merge changes from topic "am-d57ab5b93366460484e411e57bf25f25" into android12L-tests-dev

* changes:
  Merge changes from topic "am-e7d395d6fa3941648fa138d7beebf596" into android12-tests-dev am: a3030f85a7
  [automerger skipped] Merge "DO NOT MERGE. Fix the cts tests" into android11-tests-dev am: 4fdf378d30 -s ours am: 1df6a936e7 -s ours