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

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



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