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

am skip reason: skipped by user karthikmr

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

Change-Id: Ib8c33839408a31dd88e0b8dd0126f72af200c4e7