* 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: 7dd60cfa am: ce4baa4d
  [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: ee4cfd09 -s ours am: 7315c731 -s ours