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

[automerger skipped] Merge "Adding Car GSI public key" into android10-tests-dev am: 3d7e667b -s ours am: 191b82f0 -s ours am: 1c78a382 -s ours am: 6b79f7df -s ours am: 3bf8fbeb -s ours am: 4386a46c -s ours

am skip reason: skipped by user karthikmr

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



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