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

Change-Id: I76241cdf485b9b9e6193a22cf5748d8695ff8d23