tree 8536a59c8818cf5eb9ca12d5e56af3783f865469
parent 03a9e81889d0a5fca7e149f9c35903a2d8a0f1c9
parent 0bcf4952d08721afd5da48d8b33b5d869e8e2c8f
author Xin Li <delphij@google.com> 1628889626 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628889626 +0000

[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 10599ad255 -s ours am: 0bcf4952d0 -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: Ic56a33299489a74526586c8006408aead1201fee