Merge "Track RulesManagerService frameworks/base changes"
am: 7d269cb555

Change-Id: I7022bd9366477da55558bd174ac41773a876d6bf