Merge "Tweak dumpsys content for DevicePolicyEngine" into main