[automerger skipped] Merge "Revert DevicePolicyManager time / zone changes" am: fda5136933 am: 250c76cca7 -s ours am: 55e4314bd5 -s ours am: 2f9813d63f -s ours

am skip reason: Change-Id Ia60702492231cc4c7c5de157c1f266d30996d950 with SHA-1 ce50962714 is in history

Change-Id: I686c585ac18ce1f2999549d3268c9a555a5c824c