Merge "Tidy up RulesManagerService code" am: d5517c39e8
am: ef21b72dd1

Change-Id: I600ee50f8c5c463853035c2a83e43d2ce0149caa