[automerger skipped] Merge "Truncate ShortcutInfo Id" into rvc-qpr-dev am:...

[automerger skipped] Merge "Truncate ShortcutInfo Id" into rvc-qpr-dev am: ed402182 -s ours am: 2cbc9dcf -s ours am: 3338659f -s ours am: a67b0621 -s ours am: 8f331aab -s ours

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

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



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