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

[automerger skipped] Truncate ShortcutInfo Id am: fee62a33 -s ours am: 0a632fef -s ours am: 07da6d19 -s ours am: 5b5df7f9 -s ours am: 6cd3cdfa -s ours am: abd1adc2 -s ours am: 483293cc -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: I5f811467eedccd17490184ca3c737bd3a746e51a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>