Merge "Merge "Revert the time zone display name logic" into oc-dev am:...
Merge "Merge "Revert the time zone display name logic" into oc-dev am: d9b1697b am: 08cd707b" into oc-dr1-dev-plus-aosp
am: 66891920
Change-Id: Ifa5ed37d8e58f0e5039386f4f1881f8c5a174a72