Merge "Add (disabled) time zone update system server impl" into oc-dev-plus-aosp
am: 1c5c8a4a3b  -s ours

Change-Id: If6e1835966e8de9e6d64c547f4e259783b083f67