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

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;