[automerger skipped] Truncate ShortcutInfo Id am: d35e2ef6 -s ours am:...

[automerger skipped] Truncate ShortcutInfo Id am: d35e2ef6 -s ours am: a3edfb8f -s ours am: b575efcc -s ours am: 639b41b7 -s ours am: 5c907636 -s ours am: e6a17841 -s ours

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

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



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