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

Change-Id: Iafe364e96d4538c4141f25eff3b1756cff63f9a6