Merge changes from topic "am-5a09988d50484da3931f193fe3b0f1f7" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-qpr1-dev am: 5cdb1689 -s ours am: c0d3a87a -s ours am: 320c2e66 -s ours am: 41210145 -s ours
  [automerger skipped] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. am: 8175c6a0 -s ours am: 1cf3ad5f -s ours am: 4a5f2261 -s ours am: 9333a2ee -s ours