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

Change-Id: Iba3c61d775b47919a63a47982c0197d125dddf54