[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: 3c9dcedf -s ours am: 39a1daa6 -s ours am: 93ed2c83 -s ours am: 96a2ea88 -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: Iac9261fb8ebc6b3fffc740382fa98394a94e53c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>