[automerger skipped] DO NOT MERGE - Merge Android 13 am: 35fbe958f4 -s ours am: 8a3c982932 -s ours

am skip reason: Merged-In Ia13168bc2fc91a92448f8f679aa6de9c5f900549 with SHA-1 d12c1d5fda is already in history

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

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