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

Merge "[automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-dev am: b8b306b2 -s ours am: 71e2d68e -s ours am: ebab1eac -s ours am: 53261f62 -s ours am: 89376a51 -s ours am: a207bf4e -s ours am: 433b03e5 -s ours am: 9d25463f -s ours" into udc-d1-dev-plus-aosp am: ba300b8a -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/+/22905557



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