Merge "[automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev am: c8347811 am: 2f91e4e8 -s ours am: 67c38a0f -s ours am: cf79a333 -s ours" into tm-d1-dev-plus-aosp am: d3b631c9 am: 1fa2029b -s ours

am skip reason: subject contains skip directive

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



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