Merge "[conflict] Merge "Fix BP face auth requiring full tap after auth" into...

Merge "[conflict] Merge "Fix BP face auth requiring full tap after auth" into udc-d1-dev am: d97c8972" into udc-qpr-dev am: 211eeaa2

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



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