Merge "Rename NotificationChannel#setBlockableSystem" into rvc-dev

src/com/android/settings/homepage/contextualcards/slices/NotificationChannelSlice.java

@@ -467,7 +467,7 @@ public class NotificationChannelSlice implements CustomSliceable {
                 return true;
             }
 
-            return channel.isBlockableSystem()
+            return channel.isBlockable()
                     || channel.getImportance() == IMPORTANCE_NONE;
         }
 

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

@@ -134,7 +134,7 @@ public abstract class NotificationPreferenceController extends AbstractPreferenc
                 return channel.getImportance() == IMPORTANCE_NONE;
             }
 
-            return channel.isBlockableSystem() || !mAppRow.systemApp
+            return channel.isBlockable() || !mAppRow.systemApp
                     || channel.getImportance() == IMPORTANCE_NONE;
         }
         return false;