[automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-qpr1-dev am:...

[automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-qpr1-dev am: b4338bd1 -s ours am: fb809ba8 -s ours am: d393f944 -s ours am: 0fca42b7 -s ours am: 83bf723d -s ours am: 76b9bf09 -s ours am: 92493119 -s ours am: ac693e19 -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: I3641337997ae35431abfb2387b91eba5ce69bb69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>