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

Change-Id: I1795710ad2a55aee773505c96bce51e4ccca410c