tree 24d47c4684a18180893e82c689d0ea893e454716
parent 3422efc7b3b53b9152ee4c6d4e7bfc7c586227cb
parent dae2b18d1e28f3dbe02782a349eb39724d39d255
author Xin Li <delphij@google.com> 1656547377 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1656547377 +0000

[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: b339b4787e -s ours am: 72fce2c29e -s ours am: dae2b18d1e -s ours

am skip reason: Merged-In I9670bc63fb7d9e2c2091357f16bea27e8e3331bf with SHA-1 a2a1421dd5 is already in history

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

Change-Id: I4a51205b8ccb67740c0f0508773e9f03fd93ff0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>