Merge "Fix merge conflict." am: 187a9a08 am: ea256c68

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1592111

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d070661be72383036f1b16a0c2396840c7e7475

tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java

@@ -46,7 +46,9 @@ import androidx.test.runner.AndroidJUnit4;
 import com.android.internal.R;
 import com.android.server.connectivity.NetworkNotificationManager.NotificationType;
 
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.AdditionalAnswers;