Merge "A2DP Revert "Move A2dp State to Disconnected when BT is Turned OFF""
am: efc0a6d3ca

Change-Id: I36d8daaf06141b69edcde6146d26065ed7d6a30f