[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-dev am: c8347811 am: c5324761 -s ours am: 00a442d6 -s ours am: d38f05b5 -s ours am: fb040be7 -s ours am: 44d5965b -s ours am: c4458c28 -s ours

am skip reason: subject contains skip directive

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



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