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

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

Change-Id: I2807d47e068e10d6f71284c4cfae57cd9665564d