Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_frameworks_opt_timezonepicker into leaf-3.1

Change-Id: Id5928fdd462307df6b46818f3d0ba80122d77b96