tree ce07eb8edba6988e583b7f3a35e98f2d22e5503d
parent 23479a75fff40aa6086d4a299eadacb5aab49fc4
parent 2692482cdba4233ccd52f5653c2bc986dcf4cb96
author Xin Li <delphij@google.com> 1629001178 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629001178 +0000

[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 10599ad255 -s ours am: 0bcf4952d0 -s ours am: 2692482cdb -s ours

am skip reason: Merged-In I77d92d95f0db738059c515f0699e154c7cb19e33 with SHA-1 b30ded9d98 is already in history

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

Change-Id: I15f1fc666c8c053ffac2ce83710a86e11a208fba