[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: 2d60fb36 -s ours am: f9c39c4b -s ours am: c986aaec -s ours

am skip reason: subject contains skip directive

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



Change-Id: I3314315c3cb046b248c7da9cd4774ea80093c951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>