Merge "AudioService: fix deallock setBluetoothScoOn vs setMode" into pi-dev am: 8a12361b8c
am: 257b52411c

Change-Id: I6ddfa299959df7c1e61137853c1c7c40ce3701d1