Track RulesManagerService frameworks/base changes
am: da40e61fe0

Change-Id: Ifbbf95e5966aa61336e60955e563b8967973f31b