Merge "Merge "Truncate ShortcutInfo Id" into tm-qpr-dev am: d2adae78" into udc-dev am: f94880bb

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



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