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 am: 22f0c9be

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



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