Merge "Display "No service" on status bar when SIM unready" am: a666dbb6 -s...
Merge "Display "No service" on status bar when SIM unready" am: a666dbb6 -s ours am: e59a45f3 am: a71be8e2
am: b3ed63ca
Change-Id: I0fe5ea6f7ab4fcf30349b91d919a20954f7866db