Merge "Alter condition for starting RulesManagerService" am: a338679173 am: 3e928af733 am: 4c1ade06b3
am: a63d879f4c

Change-Id: I84949a5f869d25fd61a5a79b4f0a772582829da5