Merge "Do not clear calling identify when using BiometricPrompt from FingerprintService." into tm-dev am: 50941f8b am: ca419cf4 am: 1395c4ce am: 45d75d51

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



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