Merge "AudioService: restore A2DP/wired headset auto selection" into nyc-mr1-dev