Merge "Avoid hotspot band updates when country code is inactive" into udc-dev...

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

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



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