Merge "Add (disabled) time zone update system server impl" am: cba224e833
am: 0a6aeccab2

Change-Id: Idbd7614472b51a87e217bb21720ecfb0b063d237