Merge "AudioService: remove deprecated forcing of A2DP off" into nyc-mr1-dev am: 2839d2ec04
am: e72105386e

Change-Id: I4394e82b5601cd7e3eb95401e0e8c5b3616f5d08