[automerger skipped] Merge "Change toast in automatic network selection" am: 7d98a841bc
am: 91bc5fdd26  -s ours

Change-Id: I4174329665efe35a34725e3e5aa76a111d00de56