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

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



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