Merge "Custom Lockscreen Shortcut preview reflects whether a shortcut is...

Merge "Custom Lockscreen Shortcut preview reflects whether a shortcut is activated" into tm-qpr-dev am: 74527a3f am: 8962016c am: a931dede

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



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