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

Change-Id: Icbdf6db61b8b31118f267aa6cdc637afc696e678