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

Change-Id: I18a379c978e6c9c0554d19978564238c298c5651