[automerger skipped] Merge "Align time zone + other country detection logic"...

[automerger skipped] Merge "Align time zone + other country detection logic" into tm-d1-dev am: 29acfcea am: c9c92b04 -s ours am: e03cb3bf -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: Ie377c6814a1c4db5418faf03ec21933f333059fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>