Reformat timezone name to better distinguish GMT from timezone. DO NOT MERGE

Merge of https://googleplex-android-review.googlesource.com/#/c/305860/
into Cream.

Bug: 8794160
Change-Id: I90c95cc14fc37ef95432fb7c5b099acc825e191b
2 files changed