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

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



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