Merge "Merge "AudioService: restore A2DP/wired headset auto selection" into nyc-mr1-dev am: 63e2d63817 am: bdb57accbe" into nyc-mr1-dev-plus-aosp