Merge "Encounter unknown error in test" into main

import com.android.settings.network.ims.MockWfcQueryImsState;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

    }

    @Test

    @Ignore

    public void getCurrentCarrierNameForDisplay_withoutSubId_returnNotNull() {

        assertThat(MobileNetworkUtils.getCurrentCarrierNameForDisplay(

                mContext)).isNotNull();