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

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

Change-Id: Ib93f3d3ba573496cc293570774a74ed990d2cda5