[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: 82f93253 -s ours

am skip reason: Merged-In I6d74cf9960a09b7d3261154e711f824058b0d25a with SHA-1 4901097a is already in history

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



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