Merge "Add dumpsys support to RulesManagerService"