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

Merge "Merge "[Settings] Stop network mode query when changing config" into tm-dev am: fccca65c am: 8bd1ac8a" into tm-d1-dev-plus-aosp am: 85f5fa0c

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



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