Revert "AudioService: remove deprecated forcing of A2DP off" am: cf09fe6801 am: 8902c288b7
am: 38b5579261

Change-Id: Iea5ee66996db5d39b11cf3f278b1db5795db09d8