Merge "Revert DevicePolicyManager time / zone changes"