Merge "LE Audio: close GATT server properly" into tm-qpr-dev

android/app/src/com/android/bluetooth/mcp/MediaControlGattService.java

@@ -1387,12 +1387,18 @@ public class MediaControlGattService implements MediaControlGattServiceInterface
         if (DBG) {
             Log.d(TAG, "Destroy");
         }
-        if (mBluetoothGattServer != null
-                && mBluetoothGattServer.removeService(mGattService)) {
+
+        if (mBluetoothGattServer == null) {
+            return;
+        }
+
+        if (mBluetoothGattServer.removeService(mGattService)) {
             if (mCallbacks != null) {
                 mCallbacks.onServiceInstanceUnregistered(ServiceStatus.OK);
             }
         }
+
+        mBluetoothGattServer.close();
     }
 
     @VisibleForTesting