[automerger skipped] Merge "Showing up network selection notification if out of service for a while." am: e3dc5e335c am: d20fd474e9
am: 3ebd91eb79  -s ours

Change-Id: I8c40d1f30dc1d4cc2be95fec01f2c432569a09d6