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

* changes:
  [conflict] audioservice: improve SCO audio control logic 2p: a0b2ee74b2
  audioservice: improve SCO audio control logic