Merge changes I8ca2871c,Ia633a159 into nyc-mr1-dev

* changes:
  Revert "AudioService: remove deprecated forcing of A2DP off"
  Revert "AudioService: restore A2DP/wired headset auto selection"