Merge "DevicePolicyManagerService - migrate to platform compat framework gating."