Merge "Improved dumpsys device_policy:"