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-dev am: 1fe8b30f

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



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