Merge "Align time zone + other country detection logic" am: 468c78bf am:...

Merge "Align time zone + other country detection logic" am: 468c78bf am: 7265fa2d am: 98050f63 am: f3583aa6 am: 5cffe5ac

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2087009



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