Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: b74237e57d

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/timezonepicker/+/1431518

Change-Id: I1239509e5bcafae33d2389d7de3e594f1125751b