[automerger skipped] Merge "Truncate ShortcutInfo Id" into rvc-qpr-dev am: ed402182f2 -s ours am: 2cbc9dcf80 -s ours am: 3338659fc1 -s ours am: a67b062178 -s ours
am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 ab0c8ac5b4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22907464
Change-Id: Ibf7e9aabe2c0d44e4da490ea8e30e89abdac894b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: