Merge "Fix NullPointerException in the android.telephony.ims.cts.EabControllerTest" am: 4ce6c6a010

Original change: https://android-review.googlesource.com/c/platform/cts/+/1652628

Change-Id: I349c9c3a71192e5b8202a6880803b51f9fa0f710
diff --git a/tests/tests/telephony/current/src/android/telephony/ims/cts/EabControllerTest.java b/tests/tests/telephony/current/src/android/telephony/ims/cts/EabControllerTest.java
index 2b613c6..5e0bcb0 100644
--- a/tests/tests/telephony/current/src/android/telephony/ims/cts/EabControllerTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/ims/cts/EabControllerTest.java
@@ -178,12 +178,12 @@
         }
         sServiceConnector = null;
 
+        overrideCarrierConfig(null);
+
         if (sReceiver != null) {
             InstrumentationRegistry.getInstrumentation().getContext().unregisterReceiver(sReceiver);
             sReceiver = null;
         }
-
-        overrideCarrierConfig(null);
     }
 
     @Before