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

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



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