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

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



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