Merge "Merge "Fix BP face auth requiring full tap after auth" into udc-d1-dev...

Merge "Merge "Fix BP face auth requiring full tap after auth" into udc-d1-dev am: d97c8972" into udc-d1-dev-plus-aosp am: 9403ea6d am: c44258ee

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



Change-Id: I9d584cae1db60e92f92a550d569f89b20a2a28a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>