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

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



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