Merge changes from topic "am-6fdb5074ec5d4910953dea8083e26d2b" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Truncate ShortcutInfo Id" into rvc-dev am: ab15dd47 -s ours am: c8e95960 -s ours am: 5498223c -s ours am: d0a58c8a -s ours am: 8534aec6 -s ours am: 80074780 -s ours am: 7ae56355 -s ours am: d21b09b4 -s ours am: 37f9fc65 -s ours am: 981d46aa -s ours am: d15f0efb -s ours
  [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