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

Change-Id: I0fe5ea6f7ab4fcf30349b91d919a20954f7866db