Merge "Capitalize TZ display name strings" am: 6576601e am: 126b33ed am:...

Merge "Capitalize TZ display name strings" am: 6576601e am: 126b33ed am: 8b3945c5 am: 5b9c1ce7 am: cb474132

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2055926



Change-Id: Ic3713ad2640e2e2c80e6e10f98afd8f2e923da59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>