[automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when...

[automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-qpr1-dev am: 5cdb1689 -s ours am: c0d3a87a -s ours am: 320c2e66 -s ours am: 41210145 -s ours

am skip reason: subject contains skip directive

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



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