Merge "Hide conversation bubble switch if app bubbles are off" into rvc-qpr-dev am: 794482fb92

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12410582

Change-Id: I84db13dbe58d05cb8639515e302b927c00342662

src/com/android/settings/notification/app/BubblePreferenceController.java

@@ -77,7 +77,7 @@ public class BubblePreferenceController extends NotificationPreferenceController
             if (isDefaultChannel()) {
                 return true;
             } else {
-                return mAppRow != null;
+                return mAppRow != null &&  mAppRow.bubblePreference != BUBBLE_PREFERENCE_NONE;
             }
         }
         return true;