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

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



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