Merge "Increase the char limit of shortcut categories" into udc-dev am: a5b8b448

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



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