[automerger skipped] Merge "Remove the second network scan." am: 99a7c3ef am: 7f567d42 -s ours am: 6343b812 -s ours am: e6ba59fc -s ours

am skip reason: Change-Id If593fc4a4dd463bbc178b4864ad0ba01bb421b09 with SHA-1 b7f98f76 is in history

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

Change-Id: I21d38488fb8258df484cbe3b1db177bd436d00cc