Merge "Revert DevicePolicyManager time / zone changes" into rvc-dev