Merge changes from topic "am-ef3da5f67a2347bf90f254e08ab9ff88" into udc-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-v2-dev am: 04c42b8c -s ours am: 2fd58ff8 -s ours am: 21da38fb -s ours am: 608ee7b3 -s ours am: 0856591b -s ours am: 8fb33c7e -s ours
  [automerger skipped] Truncate ShortcutInfo Id am: fee62a33 -s ours am: 0a632fef -s ours am: 07da6d19 -s ours am: 5b5df7f9 -s ours am: da1299ad -s ours am: 24497432 -s ours