Merge "Retry getKeyAttestationApplicationId when fails" into main