[automerger skipped] [automerge] Truncate ShortcutInfo Id 2p: ab0c8ac5b4 am: 4bc48527c0 -s ours am: c44c03297d -s ours

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

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

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