Merge "Truncate ShortcutInfo Id" into udc-dev am: 2ab75a77 am: f8691862...

Merge "Truncate ShortcutInfo Id" into udc-dev am: 2ab75a77 am: f8691862 am: 1c8f1af7 am: 08b03c6e

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



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