[conflict] 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: I327d522d82258f873e3ce24e1686517851993039
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>