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: 3a211f46 am: 4d71c81b

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



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