Merge "Add unlock to see more messaging to notif footer" into tm-qpr-dev am: 437f91af

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



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