Merge "Remove TimeZoneTest.testAllDisplayNames"
am: 65a085c31c

Change-Id: I113311059445e4e5ac262fe57fae3c07f1ac4824