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

Change-Id: I23ade429a883993cc5cf4bc0a54ad650768bf857