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 am: d7f37a9a

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



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