Merge "Merge "Merge "Tidy up RulesManagerService code" am: d5517c39e8 am: ef21b72dd1 am: c2f58098c1" into oc-dr1-dev-plus-aosp am: 224980cda6" into oc-mr1-dev-plus-aosp
am: 55ce3e4688

Change-Id: Iedfc845f2764ebf21b424922a3f1bc51f44e066b