[automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-qpr1-dev am: b4338bd141 -s ours am: fb809ba82c -s ours am: d393f944b0 -s ours am: 0fca42b79b -s ours am: 83bf723d59 -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/+/22907731
Change-Id: I8e3ffc1a14f243d23ee7e74d7a5e5bc50c3eca91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: