[automerger skipped] Merge "Revert DevicePolicyManager time / zone changes"...

[automerger skipped] Merge "Revert DevicePolicyManager time / zone changes" am: fda51369 am: 250c76cc -s ours am: 55e4314b -s ours am: 2f9813d6 -s ours am: 85fcb0f8 -s ours

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

Change-Id: Ibddc09173000873eea3fae59d4ad914484f0313e