[automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-v2-dev am:...

[automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-v2-dev am: 04c42b8c -s ours am: 2fd58ff8 -s ours am: 21da38fb -s ours am: 608ee7b3 -s ours am: 0856591b -s ours

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

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



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