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

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

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