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

[automerger skipped] Truncate ShortcutInfo Id am: 6a278c39 -s ours am: 947889f9 -s ours am: a06222a3 -s ours am: 4a654f90 -s ours am: bb8846f2 -s ours am: aa3d7de7 -s ours

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

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



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