Merge "AudioService: restore A2DP/wired headset auto selection am: 383dc532f3 am: 8097459f66" into nyc-mr1-dev-plus-aosp