Merge changes from topic "am-7206c583f34949c299ce90858cf1afd5" into android12L-tests-dev

* changes:
  Merge changes from topic "am-2836a4d711754834abedc83f98b2abed" into android12-tests-dev am: 53542c3757
  [automerger skipped] Merge "Adding Car GSI public key" into android10-tests-dev am: 3d7e667b0a -s ours am: 191b82f0e9 -s ours am: 1c78a382bd -s ours