Merge "Truncate ShortcutInfo Id" into tm-dev am: c3b422079b

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

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