[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: ac89f868 -s ours am: 5410ad42 -s ours am: 3b8fef3d -s ours am: 66270fcd -s ours am: 311d8030 -s ours am: 7ee599a5 -s ours am: a4dfa62b -s ours

am skip reason: subject contains skip directive

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



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