Merge changes from topic "am-f182dd0232d64c57b5a2bd653bdb591c" into tm-qpr-dev-plus-aosp

* changes:
  Merge changes from topic "cve-fp-sc-v2-dev-sc-qpr1-dev-sc-dev" into sc-mainline-prod am: 110c9b4c am: 7f4a849c am: de4ca763 am: 320f6f68
  [automerger skipped] [automerge] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. 2p: ac89f868 am: a3744e1b -s ours am: 16c34127 -s ours am: 02e57572 -s ours am: 4dacd312 -s ours