Merge "Always show face auth error messages on bouncer" into sc-dev am: 34d05933 am: 05575d7f

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

Change-Id: If4cd83f70ac60db70066b635df8cfeaef00a1fef