Merge "Merge "Revert DevicePolicyManager time / zone changes" into rvc-dev am:...
Merge "Merge "Revert DevicePolicyManager time / zone changes" into rvc-dev am: d2d3e4d9 am: 48c18254" into rvc-d1-dev-plus-aosp am: ddbb6ccb
Change-Id: Ica14b21795f28e280025d25968a043a4d455ed6c