Merge "Disable need to long-press lockscreen shortcuts when device is docked"...

Merge "Disable need to long-press lockscreen shortcuts when device is docked" into udc-dev am: e597433f am: dec456bf

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



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