Merge "Do not clear the existing no calling states" into sc-dev

        mIconController.removeAllIconsForSlot(mSlotMobile);

        mMobileStates.clear();

        List<NoCallingIconState> noCallingStates = new ArrayList<NoCallingIconState>();

        noCallingStates.addAll(mNoCallingStates);

        mNoCallingStates.clear();

        final int n = subs.size();

        for (int i = 0; i < n; i++) {

            mMobileStates.add(new MobileIconState(subs.get(i).getSubscriptionId()));

            boolean isNewSub = true;

            for (NoCallingIconState state : noCallingStates) {

                if (state.subId == subs.get(i).getSubscriptionId()) {

                    mNoCallingStates.add(state);

                    isNewSub = false;

                    break;

                }

            }

            if (isNewSub) {

                mNoCallingStates.add(new NoCallingIconState(subs.get(i).getSubscriptionId()));

            }

        }

    }

    private boolean hasCorrectSubs(List<SubscriptionInfo> subs) {

        final int N = subs.size();