Merge "Remove TimeZoneTest.testAllDisplayNames() failure"
am: f5ca86683e

Change-Id: I14b8822eb161350098825eb0e6097f78f218b9de