Merge "Tidy up RulesManagerService code"
am: d5517c39e8

Change-Id: I56afb0031c2768ea5aed0797b64c9ebda91be8e8