Merge "AudioService: fix SCO audio resume after call" into sc-v2-dev am: 14a62045ac am: 4014405999

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16440301

Change-Id: Ica67abeacfc24bd6360c0d36ffdd52f1edad165b

services/core/java/com/android/server/audio/AudioDeviceBroker.java

@@ -327,7 +327,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
         }
 
         boolean isBtScoRequested = isBluetoothScoRequested();
-        if (isBtScoRequested && !wasBtScoRequested) {
+        if (isBtScoRequested && (!wasBtScoRequested || !isBluetoothScoActive())) {
             if (!mBtHelper.startBluetoothSco(scoAudioMode, eventSource)) {
                 Log.w(TAG, "setCommunicationRouteForClient: failure to start BT SCO for pid: "
                         + pid);