tree 796ba7e569dcaf48e61482f695f118207e431871
parent 9364bdbcdc1360f00a63af4a270b6c3eaba6c0ec
parent f369f90c1e6c530a0e16b141e3373851eeb3342a
author Xin Li <delphij@google.com> 1644862884 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1644862884 +0000

[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 35bc073d1f -s ours am: f369f90c1e -s ours

am skip reason: Merged-In I0bc25869eee8baef53664e16dedbeda7fa28a9a7 with SHA-1 b0836ab0a9 is already in history

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

Change-Id: I2c9390665d389fae5b0aed61140646fb6e1bf1e9