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

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

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