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

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



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