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

Change-Id: I2b51a9f63d7b0090130fa07aea0f2c3ca1d98c05