[automerger skipped] Merge "fix the issue of empty network selection notification" am: 73d9cca061 am: 037347bebc  -s ours
am: 206d215e3d  -s ours

Change-Id: I845e88e27107f2ad7ab25ba6b0ceaaaaafd33d05