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: c3a45893

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



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