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

Merge "Merge "Truncate ShortcutInfo Id" into udc-dev am: 2ab75a77 am: 119e5297 am: 77b3ea56" into udc-qpr-dev-plus-aosp am: 807795c0

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



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