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

Change-Id: Ie0d80839204a9acd6bfb1e1ce3945efb6176fca3