Merge "Show the face lockout follow-up message after the screen fully turns...

Merge "Show the face lockout follow-up message after the screen fully turns on." into tm-qpr-dev am: a3542e18 am: 0f1f1ace

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



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