Merge "Time zone update API classes" into oc-dev-plus-aosp