Merge "SecureElement: AIDL retryOnFail" am: 39dc2bda6b am: 3aab97e714 am: 62788441eb am: d21b2b8ca2 am: 5405c498ab

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

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