Revert "Stop showing long names for local timezones when it is ambiguous"

This reverts commit cc4d2c22d4c444e877830b77a1e4246ca292e662.

Change-Id: I04773f3dd0f2d5756e6901185fe24b5310c5041e
2 files changed