tree ce07eb8edba6988e583b7f3a35e98f2d22e5503d
parent 0c8ffe12e5ef9f5ffe7fd40d36f2875537b56504
parent 0cbc833457d7bea4ed0f21f205b4396b6e166dce
author Xin Li <delphij@google.com> 1629229614 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629229614 +0000

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: abd6b40ada -s ours am: 0cbc833457 -s ours

am skip reason: Merged-In I5c239fb24acd53a1a96b245b74a5d27b92e97a1e with SHA-1 ef3781e8ff is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/keymaster/+/15572061

Change-Id: I74bc18a5f7a17f2b25d74243c88a9e9f177321bd