Merge "AudioService: remove deprecated forcing of A2DP off" into nyc-mr1-dev