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

Change-Id: I13adaf47718826007b8ad4a0530da319da8ec071