[automerger skipped] Merge "Merge "Revert DevicePolicyManager time / zone changes" into rvc-dev am: d2d3e4d9 am: 48c18254" into rvc-d1-dev-plus-aosp am: ddbb6ccb am: 18d75975 -s ours
am skip reason: Change-Id Ia60702492231cc4c7c5de157c1f266d30996d950 with SHA-1 77c9fcdb is in history

Change-Id: I55609e9a87edaac50c1a983b27f7e9d51ab355cd