Merge "Avoid hotspot band updates when country code is inactive" into udc-dev am: f6c0e2d4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23341837



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