tree d26c7896d3966f3f408eac35668d3d4491363467
parent a9007aaba59939a292dc307dfc146abe2b6e7f8c
parent d3662c20db0035bbada8c505c9698188f20f0ca7
author Xin Li <delphij@google.com> 1670627693 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670627693 +0000

[automerger skipped] Merge Android 13 QPR1 am: d3662c20db -s ours

am skip reason: Merged-In I8b921b172b3d45a17a02a7bc81dce54e7167b3d8 with SHA-1 4663fb4035 is already in history

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

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