Merge "Fix failure of ZenModeAutomaticRulesPreferenceControllerTest"