Merge "[automerger skipped] Merge "Adding Car GSI public key" into...

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

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1915268



Change-Id: I2d1066a354544169682d4bb104d0fb269768246c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>