Merge "Align lockscreen state and picker state for Device Controls shortcut"...

Merge "Align lockscreen state and picker state for Device Controls shortcut" into udc-qpr-dev am: cb9ba144

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



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