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

Change-Id: I6eb630cf7baeb633e1bca21da2bcd69e8d8a4612