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

Change-Id: I18bbb4674f4303e7d2f74f9a38d3cd7d6f10f359