Merge "Display "No service" on status bar when SIM unready am: c2b9f772d0  -s ours" into oc-mr1-dev-plus-aosp
am: 144acd75f3

Change-Id: I32ae7adfb46422c6e8ca55172492ed53131a243a