Merge changes from topic "am-8e5c4b2c1e154c948b6641e28d90d0bd" into tm-d1-dev-plus-aosp

* changes:
  [automerger skipped] Merge "[Do Not Merge] Ignore malformed shortcuts" into rvc-dev am: 9e3aecfc am: f5529518 -s ours am: c03b0e2d -s ours am: e1db2fe6 -s ours am: 56d11db9 -s ours am: 9238480a -s ours am: a3f0bcf1 -s ours
  [automerger skipped] [Do Not Merge] Ignore malformed shortcuts am: a8fe41af am: 10033535 -s ours am: 5774c840 -s ours am: a8ab42d1 -s ours am: ac01de83 -s ours am: 97f23e67 -s ours am: 895e8c5d -s ours