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

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

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