Merge changes from topic "am-33f56d00dbd94b47bf758ee6c04926d9" into tm-d1-dev-plus-aosp

* changes:
  Merge changes from topic "presubmit-am-a10436ba523c443696b70308db2adac6" into sc-qpr1-dev am: d7133ae5 am: a0b9c690 am: bdaf7f71 am: 9a7992db
  [automerger skipped] [automerge] [Do Not Merge] Ignore malformed shortcuts 2p: 36338a31 am: a536efe2 -s ours am: 7aec23bf -s ours am: 3841f5c1 -s ours am: db54cdfa -s ours