Merge "UX polish for lock screen preview (1/3)." into tm-qpr-dev am: 9ddeac90 am: b3fea560

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



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