Merge "Always show face auth error messages on bouncer" into sc-dev am:...

Merge "Always show face auth error messages on bouncer" into sc-dev am: 34d05933 am: f29f8918 am: 81fe41b6

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

Change-Id: Ic378ac9246dc2f1e3482f15db095d4a7b0fb4cd8