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: 6b59fa18 am: e5f0c011 am: 6cc5ff8d

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



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