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

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



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