Merge changes from topic "presubmit-am-39bffc9bd308472c84a44b9f6cfd6472" into sc-qpr1-dev am: e9f53ac706 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/timezonepicker/+/15959556 Change-Id: I8598062b2bd12ac49d36695c2ca51c6a0cbc7649