Merge "Merge "Tidy up RulesManagerService code" am: d5517c39e8 am: ef21b72dd1 am: c2f58098c1" into oc-dr1-dev-plus-aosp