Merge "Do not clear calling identify when using BiometricPrompt from...

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

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



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