[automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-dev am: b8b306b28f -s ours am: 71e2d68ec8 -s ours am: ebab1eac42 -s ours am: 53261f62e0 -s ours am: 89376a51cf -s ours
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 d35e2ef67c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22905557
Change-Id: Ifae6625d71f0e51da571a4288c10ac03b172625f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: