Merge changes from topic "am-640b9c4d307a4b91b819b15acc0da0d8" into udc-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "Truncate ShortcutInfo Id" into sc-qpr1-dev am: b4338bd1 -s ours am: fb809ba8 -s ours am: d393f944 -s ours am: 0fca42b7 -s ours am: 83bf723d -s ours am: 2f8d2067 -s ours am: 62b1bea4 -s ours am: b76b1dbd -s ours
  [automerger skipped] Truncate ShortcutInfo Id am: d35e2ef6 -s ours am: a3edfb8f -s ours am: b575efcc -s ours am: 3c9dcedf -s ours am: 39a1daa6 -s ours am: 93ed2c83 -s ours am: 96a2ea88 -s ours am: 9f2024ad -s ours