Merge "fix crash in setting time zone" into main am: 15f88ddc70

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3079352

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