[automerger skipped] Merge "Align lockscreen state and picker state for Device...

[automerger skipped] Merge "Align lockscreen state and picker state for Device Controls shortcut" into udc-qpr-dev am: cb9ba144 am: 21f91f5d -s ours

am skip reason: Merged-In Id98d0d16e11c3291dc4b906f7dd6e10d077ac96c with SHA-1 bc161c91 is already in history

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



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