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

Change-Id: Icc105a9598694aa9e848a6e0f48745f8a5131647