Merge "Allow shortcuts to be pinned by unbundled chooser" into tm-qpr-dev am: 8727c639

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



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