[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 6a7763d5a2 -s ours am: 61639de9ce -s ours am: 941212ccf1 -s ours am: a2f4da5161 -s ours

am skip reason: Change-Id Icd7c55502f1b44635816faa08ffb03df5b711a75 with SHA-1 028ac8c3ca is in history

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

Change-Id: I5ded0a706ada418bfe1b1dac2310d503c1fe0cc0