Merge "Add dumpsys support to RulesManagerService" am: 348a1d635d am: 06c2f8e346 am: 61ea5e6c8f
am: 78526c3341

Change-Id: I2e4e2d5291d59933f2c6225384b2fb7464fb0e57