Merge "Track RulesManagerService frameworks/base changes"