tree 995d19836ff8f802bb2eb948f00d7eb71b67eafb
parent d404d92ae5756a3b6611399f9c9c8b4ca447e0b1
parent f4a0358ad9c0c126922529a5f10c84be05cbf3c4
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650502338 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650502338 +0000

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

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>