[automerger skipped] Merge "Change the Auto-select Network UI." am: 6af2727b7b
am: 39a0e83f84  -s ours

Change-Id: I0e6d112e232687e08ec23492e052d584b8e330dd