Merge "[automerger skipped] Merge "[DO NOT MERGE] Do not clear calling...
Merge "[automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev am: c8347811 am: 2f91e4e8 -s ours am: 67c38a0f -s ours am: cf79a333 -s ours" into tm-d1-dev-plus-aosp