[automerger skipped] Merge "Fall back to default custom shortcuts if custom...

[automerger skipped] Merge "Fall back to default custom shortcuts if custom shortcuts are disabled" into udc-dev am: 1fe8b30f am: c92b8f86 am: c2229a74 -s ours am: 96cca25f -s ours

am skip reason: Merged-In I6d74cf9960a09b7d3261154e711f824058b0d25a with SHA-1 4284c8f5 is already in history

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



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