[automerger skipped] Align time zone + other country detection logic am:...

[automerger skipped] Align time zone + other country detection logic am: 918deb57 -s ours am: f9df3a85 -s ours

am skip reason: Merged-In I2e11747d2cbbc59591e1f6b63bec969144bfe6f9 with SHA-1 9efbe0f1 is already in history

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



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