Merge changes from topic "lock-screen-preview-in-wpp" into tm-qpr-dev am: 55410112 am: c3113b6e

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



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