Merge "Merge "Time zone update API classes" am: cfe0c2f1ec am: 463f3f8cf7" into nyc-mr2-dev-plus-aosp