Merge "Do not clear calling identify when using BiometricPrompt from FingerprintService." into tm-dev am: 50941f8b am: ca419cf4 am: 60ab6a8f am: d34d4f2a

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



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