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

Change-Id: I3614a67ebf3d82f7e9bb8c99bfac02053fe053b9