tree b40d1459aee9ea4911b1721436de9d08208106dd
parent 3b8fef3d48881e98a568f4abd6bee3bec8fe5484
parent c53247615d436b563c5956fa8197a5bccf68034b
author Joe Bolinger <jbolinger@google.com> 1650909024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650909024 +0000

[automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev am: c8347811b2 am: c53247615d -s ours

am skip reason: subject contains skip directive

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

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