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: cf6ad769 am: 0662aa34

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



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