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

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

Change-Id: Ib7cfb9a2b8fc83048ecd7e5b8963407ef97e97ca