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

[automerger skipped] Merge "Adding Car GSI public key" into android11-tests-dev am: efcca342 -s ours am: 6033c0d9 -s ours am: d404d92a -s ours am: 3fdf47ae -s ours am: 7cb0c7a0 -s ours am: a96b20d0 -s ours am: 86694037 -s ours am: fcbab17d -s ours

am skip reason: skipped by user karthikmr

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



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