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

Change-Id: I5b92b6a9df020ab24fc4ec4af73aff1d6251c6a3