Merge "Add unlock to see more messaging to locked shade" into tm-qpr-dev am:...

Merge "Add unlock to see more messaging to locked shade" into tm-qpr-dev am: 0b72c627 am: 9862a01c

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



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