Merge "Revert DevicePolicyManager time / zone changes" into rvc-dev am: d2d3e4d92d

Change-Id: Iae15185a17e0a7c08eb1553101bda4d8f4e0fcd3