[automerger skipped] Truncate ShortcutInfo Id am: 6a278c3998 -s ours am: 947889f9d1 -s ours am: a06222a329 -s ours am: 4a654f9025 -s ours am: bb8846f2ad -s ours am: 98f823be69 -s ours

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

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

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