[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 95a4d52a4b -s ours

am skip reason: Merged-In Ia474924b876de74dac46bad9a8bce348e7c2b671 with SHA-1 8d4704f4ad is already in history

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

Change-Id: Ife304417a9103b8bebbb5899f4cfdff8294c570e