Merge changes from topic "presubmit-am-8286fb74ec0545c4ad18b2ea8ed5f5f6" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Dialing phone state should update active sub 2p: cde6691a4d
  Dialing phone state should update active sub