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

* changes:
  [automerger skipped] Merge changes from topic "am-cfc0ee30d79b4ca58f8b32bba97a3517" into udc-dev am: e1f2854e -s ours am: 92aa4425 -s ours am: 0005d6bf -s ours
  [automerger skipped] Merge "Truncate ShortcutInfo Id" into rvc-qpr-dev am: ed402182 -s ours am: 2cbc9dcf -s ours am: 3338659f -s ours am: a67b0621 -s ours am: 8f331aab -s ours am: 091e1c39 -s ours am: b9a82b6c -s ours am: f12c2f16 -s ours am: 87425346 -s ours am: cd2e595e -s ours