Merge "Show the "Face unlock unavailable" message on bouncer as well" into...

Merge "Show the "Face unlock unavailable" message on bouncer as well" into tm-qpr-dev am: 0f8d00ae

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



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