tree 7a6ccf14e7ecc9cf63c6edeb638232bb09879ed5
parent 6b1d1bfaf11ce8ccc157f819e322dd6f74f9e75f
parent bd01df2a8b2199d3ca62e10264ca03ac26261bee
author Xin Li <delphij@google.com> 1633679816 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679816 +0000

[automerger skipped] Merge Android 12 am: 44b81d9d29 -s ours am: 1f23a87682 -s ours am: bd01df2a8b -s ours

am skip reason: Merged-In I5b235cdf4ae9572bb3768d75bd58e5a7dd9967e6 with SHA-1 95a4d52a4b is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/SecureElement/+/1847735

Change-Id: I585d1b50d150a6b53ddcca0e8533f68d911b90e4