Track RulesManagerService frameworks/base changes am: da40e61fe0 am: 5ba3f1622d
am: 5309ca83a4

Change-Id: I2ba5ee17ea9317abbb942f8174d0395fb62a3115