[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-v2-dev am: c7fdbcf1 -s ours am: e133038e -s ours am: 5bacab7b -s ours am: 615084c6 -s ours am: 771cb327 -s ours

am skip reason: subject contains skip directive

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



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