Merge changes from topic "am-e3d7420e56534d7081c701f1fd958308"

* changes:
  Merge changes from topic "am-7206c583f34949c299ce90858cf1afd5" into android12L-tests-dev am: 865187fd2c
  [automerger skipped] Merge "Adding Car GSI public key" into android10-tests-dev am: 3d7e667b0a -s ours am: 191b82f0e9 -s ours am: 1c78a382bd -s ours am: 6b79f7df2e -s ours