Merge "Fall back to default custom shortcuts if custom shortcuts are disabled"...

Merge "Fall back to default custom shortcuts if custom shortcuts are disabled" into udc-qpr-dev-plus-aosp am: 1ed7bb80

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



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