Merge "[automerger skipped] Merge "Adding Car GSI public key" into android11-tests-dev am: efcca34203 -s ours" into android12-tests-dev