Merge "Identity Credential: API changes for Android 12"