Merge "Add (disabled) time zone update system server impl" into oc-dev-plus-aosp