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

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

Change-Id: Id067d689a451a1f90a2f3d5700016878a8f7e047