Merge "Revert DevicePolicyManager time / zone changes" am: fda5136933

Change-Id: I4520b76fd77c9a02b5e3cd143d9ce5b57691f2b3