Merge "Merge "Truncate ShortcutInfo Id" into tm-qpr-dev am: d2adae78" into...

Merge "Merge "Truncate ShortcutInfo Id" into tm-qpr-dev am: d2adae78" into udc-dev am: f94880bb am: 397c713d

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



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