Merge "[Settings] Stop network mode query when changing config" into tm-dev...

Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c am: 7e7ef598 am: cb9e5a80 am: 08628287

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



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