Merge "Do not clear calling identify when using BiometricPrompt from FingerprintService." into tm-dev am: 50941f8b am: 43423d95 am: 10a9b8dc am: fbff932f

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



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