Merge "Align time zone + other country detection logic" into tm-d1-dev am: 29acfcea

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



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