Merge "Allow alternative time zone ID to be set device's zone." am: 2cd0b0aadf am: 87273aab56

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

Change-Id: I8cce932794d13dd8f9424883b9521a823583f335