Merge "Time zone update API classes" into oc-dev-plus-aosp
am: 102db03dab  -s ours

Change-Id: I6109d731f0c2debdc985e1b45c53c28745de9709