Merge "Enable a shortcut selection test." into tm-qpr-dev am: 36e32b38

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



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