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

[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 skip reason: subject contains skip directive

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



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