Merge "Fix to show the network selection no service notification" into oc-dev
am: 5e05f42365

Change-Id: Ibc1812390933934dc003356aeada96fec8110e80