Merge "show network selection notification based on nw signal" am: 412915ba78
am: ae8133cc56  -s ours

Change-Id: I353be75b88e1d681973d8ddb38439c2d39b76211