[automerger skipped] Merge "Stop network scan before manual select network"...

[automerger skipped] Merge "Stop network scan before manual select network" into 24D1-dev am: 2aca51ee -s ours

am skip reason: Merged-In Ia7e52ad94d5406cab42bd8e7b25ba7e4e13c67fc with SHA-1 39dfb52c is already in history

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



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