Merge "update fallback logic to use cached country" into udc-dev am:...

Merge "update fallback logic to use cached country" into udc-dev am: 92454b53 am: 3330cf5c am: fda62fbe

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



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