Merge "Display "No service" on status bar when SIM unready" am: a666dbb628  -s ours am: e59a45f3ae
am: a71be8e2f1

Change-Id: Ie92544f03960bddbd04f9c6b7e018cb5f646e50f