Merge "Update lock screen messages to match UX expectations." into tm-qpr-dev am: 3c3ac139

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



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