Merge "Fix NPE for ConfigureNotificationSettings" into sc-dev

src/com/android/settings/notification/ConfigureNotificationSettings.java

@@ -127,6 +127,8 @@ public class ConfigureNotificationSettings extends DashboardFragment implements
     @Override
     public void onCreate(Bundle icicle) {
         super.onCreate(icicle);
+        // TODO(b/182237530): This method should be removed when this flag is deprecated.
+        if (!FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
             final PreferenceScreen screen = getPreferenceScreen();
             final Bundle arguments = getArguments();
 
@@ -144,6 +146,7 @@ public class ConfigureNotificationSettings extends DashboardFragment implements
                 }
             }
         }
+    }
 
     @Override
     public boolean onPreferenceTreeClick(Preference preference) {