Merge "Fix BP face auth requiring full tap after auth" into udc-d1-dev am: d97c8972

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



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