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

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



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