Merge changes from topic "am-c7afca18939e4f63ba7f87bee5964c1b" 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: ec12143e am: fc83e503
  [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: feac3453 -s ours am: 7bb7be2c -s ours