Track RulesManagerService frameworks/base changes am: f4cc71826e
am: 732a706905

Change-Id: Ie9a49868290fd8ccaf845fe8cb2704e66e1db9dc