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