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

[automerger skipped] Merge "Truncate ShortcutInfo Id" into rvc-dev am: ab15dd47 -s ours am: c8e95960 -s ours am: 5498223c -s ours am: d0a58c8a -s ours am: 8534aec6 -s ours am: 80074780 -s ours am: 7ae56355 -s ours

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

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



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