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

Change-Id: I4deec00eabd90e9b16527cea138daa5377e839e5