Merge "Fixes i18n issue with shortcut names." into udc-dev am: 5be383fb am:...

Merge "Fixes i18n issue with shortcut names." into udc-dev am: 5be383fb am: 8b3a64bf am: 6b61694b

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



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