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

Change-Id: I91b59e87f57d215906c9f94da1eb6517e280eaed