Merge "Merge "Revert DevicePolicyManager time / zone changes" into rvc-dev am: d2d3e4d92d am: 29a9d0103f" into rvc-d1-dev-plus-aosp