Merge "Change the Auto-select Network UI."
am: 6af2727b7b

Change-Id: Ia136caabdb9954f4ba994c2f01b37a05e7af2198