Merge "Alter condition for starting RulesManagerService" into oc-mr1-dev am: 1807d585b5
am: b39e80a259

Change-Id: Ida238f6afe83d4f993ca803b3661f8ebd1dc1f12