Merge "Merge "Time zone update API classes" am: cfe0c2f1ec am: 463f3f8cf7" into nyc-mr2-dev-plus-aosp am: 5b14a2f0b5
am: 40394badaa  -s ours

Change-Id: I9d4b37355d1b15e97389a9a36a85b768c9c3359d