[automerger skipped] Truncate ShortcutInfo Id am: f31df623 -s ours am:...

[automerger skipped] Truncate ShortcutInfo Id am: f31df623 -s ours am: d0b98bc6 -s ours am: 657eef51 -s ours am: 1c9b60ab -s ours am: b9172859 -s ours am: f0d3de31 -s ours am: d103d1cc -s ours am: 72a3e86f -s ours am: 865ae0b1 -s ours am: addc8eca -s ours am: 84e4eb4a -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: I505648a70b583b6116f1b3e9942e619c335c1bdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>