Merge "DevicePolicyManagerService: dump less" into jb-dev