Merge "Update carrier text when phone service state is changed" into oc-dev

        public void onPhoneStateChanged(int phoneState) {

            update();

        }

        @Override

        public void onRefreshCarrierInfo() {

            update();

        }

    };

    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {

        @Override