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

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



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