Merge changes from topic "am-a2ca728fc00e433591b8b2fe31d914d7" into tm-qpr-dev-plus-aosp

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