Merge "Fix CellDataPreferenceTest" into main

import android.content.Context;

import android.telephony.SubscriptionInfo;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.LinearLayout;

import androidx.test.core.app.ApplicationProvider;

import androidx.test.ext.junit.runners.AndroidJUnit4;

import org.junit.Before;

import org.junit.Ignore;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

@RunWith(AndroidJUnit4.class)

@Ignore("b/337417779")

public class CellDataPreferenceTest {

    @Mock

                return mSubInfo;

            }

        };

        final LayoutInflater inflater = LayoutInflater.from(mContext);

        final View view = inflater.inflate(mPreference.getLayoutResource(),

                new LinearLayout(mContext), false);

    }

    @Test