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