tree ce07eb8edba6988e583b7f3a35e98f2d22e5503d
parent 2456ac8d759b95a0d00f7845c726b0a1710bc058
parent 691899084c84f9c5d0fbcdc0016ce680d344c2ab
author Xin Li <delphij@google.com> 1628890298 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628890298 +0000

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