[automerger skipped] Merge "Merge "Revert DevicePolicyManager time / zone changes" into rvc-dev am: d2d3e4d9 am: 29a9d010" into rvc-d1-dev-plus-aosp am: f31e4036 -s ours am: 1fd0a79d -s ours
am skip reason: Change-Id Ia60702492231cc4c7c5de157c1f266d30996d950 with SHA-1 ce509627 is in history

Change-Id: Ia3f87bfae6c0248902fff6422ba015fc4cc763aa