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: Iab7b1455088bfc39a10b78e1b49aaab779a5afd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>