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

Change-Id: If9fa953cadcd677f47f06642b6b99fb699f9b8a8