Merge "Minor face auth fixes" into udc-dev am: 06535b8b am: 91d1162e

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



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