[automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-dev am: b8b306b2 -s ours

am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 d35e2ef6 is already in history

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



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