diff --git a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java
index de11aa9402c..572f1d85be4 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragmentTest.java
@@ -18,100 +18,54 @@ package com.android.settings.deviceinfo.aboutphone;
 
 import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;
 
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
 
-import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.telephony.TelephonyManager;
-import android.util.ArrayMap;
-
-import androidx.fragment.app.FragmentActivity;
-import androidx.preference.PreferenceScreen;
 
 import com.android.settings.deviceinfo.BuildNumberPreferenceController;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settings.testutils.shadow.ShadowConnectivityManager;
-import com.android.settings.testutils.shadow.ShadowFragment;
-import com.android.settings.testutils.shadow.ShadowUserManager;
-import com.android.settingslib.core.AbstractPreferenceController;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
 import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-import org.robolectric.annotation.Config;
-import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.shadows.androidx.fragment.FragmentController;
 import org.robolectric.util.ReflectionHelpers;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 @RunWith(RobolectricTestRunner.class)
-@Config(shadows = {ShadowConnectivityManager.class, ShadowUserManager.class})
 public class MyDeviceInfoFragmentTest {
 
-    @Mock
-    private FragmentActivity mActivity;
-    @Mock
-    private PreferenceScreen mScreen;
-    @Mock
-    private TelephonyManager mTelephonyManager;
-
-    private Context mContext;
-    private MyDeviceInfoFragment mSettings;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        FakeFeatureFactory.setupForTest();
-        mContext = RuntimeEnvironment.application;
-        mSettings = spy(new MyDeviceInfoFragment());
-
-        when(mSettings.getActivity()).thenReturn(mActivity);
-        when(mSettings.getContext()).thenReturn(mContext);
-        when(mActivity.getTheme()).thenReturn(mContext.getTheme());
-        when(mActivity.getResources()).thenReturn(mContext.getResources());
-        doNothing().when(mSettings).onCreatePreferences(any(), any());
-
-        doReturn(mScreen).when(mSettings).getPreferenceScreen();
-        when(mSettings.getPreferenceScreen()).thenReturn(mScreen);
-        ShadowApplication.getInstance()
-            .setSystemService(Context.TELEPHONY_SERVICE, mTelephonyManager);
-    }
+    private MyDeviceInfoFragment mMyDeviceInfoFragment;
 
     @Test
-    @Config(shadows = ShadowFragment.class)
-    public void onCreate_fromSearch_shouldNotOverrideInitialExpandedCount() {
+    public void onCreate_fromSearch_shouldExpandAllPreferences() {
         final Bundle args = new Bundle();
         args.putString(EXTRA_FRAGMENT_ARG_KEY, "search_key");
-        mSettings.setArguments(args);
+        mMyDeviceInfoFragment = FragmentController.of(new MyDeviceInfoFragment(), args)
+                .create()
+                .get();
 
-        mSettings.onCreate(null /* icicle */);
-
-        verify(mScreen).setInitialExpandedChildrenCount(Integer.MAX_VALUE);
+        assertThat(mMyDeviceInfoFragment.getPreferenceScreen().getInitialExpandedChildrenCount())
+                .isEqualTo(Integer.MAX_VALUE);
     }
 
     @Test
     public void onActivityResult_shouldCallBuildNumberPreferenceController() {
+        mMyDeviceInfoFragment = FragmentController.of(new MyDeviceInfoFragment())
+                .create()
+                .get();
+
         final BuildNumberPreferenceController controller =
             mock(BuildNumberPreferenceController.class);
-        ReflectionHelpers.setField(mSettings, "mBuildNumberPreferenceController", controller);
+        ReflectionHelpers.setField(
+                mMyDeviceInfoFragment, "mBuildNumberPreferenceController", controller);
 
         final int requestCode = 1;
         final int resultCode = 2;
         final Intent data = new Intent();
-        mSettings.onActivityResult(requestCode, resultCode, data);
+        mMyDeviceInfoFragment.onActivityResult(requestCode, resultCode, data);
 
         verify(controller).onActivityResult(requestCode, resultCode, data);
     }