[automerger skipped] [DO NOT MERGE] Do not clear calling identify when using...

[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

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17650036



Change-Id: If2c2ea1a3e99aa714ba147816cfce027b6669b0f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>