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

Change-Id: I31d12210e143026eb1467f16920581a199d0fd1f