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

Change-Id: I95e0e607c1a0cfd4d1865fc5fdf19d509f650a30