cherrypick: Try to use names from time zone strings if all else fails...

Fixes b/7232823 Use time zone name when all else fails...

Change-Id: Idc2633041641db43559d32185c6bd0e2a90f4765
2 files changed