Merge "When only one device is selected in dynamic group, the device should be disabled" into rvc-dev

src/com/android/settings/media/MediaOutputGroupSlice.java

@@ -236,7 +236,7 @@ public class MediaOutputGroupSlice implements CustomSliceable {
                             + ") is unavailable");
                     return;
                 }
-                if (TextUtils.equals(device.getClientPackageName(), getWorker().getPackageName())) {
+                if (getWorker().isSelectedMediaDevice(device)) {
                     getWorker().removeDeviceFromPlayMedia(device);
                 } else {
                     getWorker().addDeviceToPlayMedia(device);