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

* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-b1e9c1f0750d47e9be992038522e27c5" into sc-qpr1-dev am: 92145ceb -s ours am: 9a1d8b1b -s ours am: 60200ddc -s ours am: ca4df7b9 -s ours am: 880614ba -s ours am: 9178b213 -s ours am: 885860df -s ours am: a7f22097 -s ours
  [automerger skipped] [automerge] Truncate ShortcutInfo Id 2p: ab0c8ac5 am: 4bc48527 -s ours am: c44c0329 -s ours am: f797cc1d -s ours am: 5f46214a -s ours am: 20f7f005 -s ours am: 3f2abe27 -s ours am: 4c918759 -s ours am: 5feb1975 -s ours