Merge "Retry getKeyAttestationApplicationId when fails" into main am: 324a81c928

Original change: https://android-review.googlesource.com/c/platform/system/security/+/2923070

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