Merge "Credstore changes for Android 12"