Merge cherrypicks of ['googleplex-android-review.googlesource.com/40009846'] into 26Q2-release.

Change-Id: Ida42573a8cb8030dfeeea7d1f67e2d7f1e964bb6

services/tests/mockingservicestests/src/com/android/server/am/ActiveServicesTest.java

diff --git a/services/tests/mockingservicestests/src/com/android/server/am/ActiveServicesTest.java b/services/tests/mockingservicestests/src/com/android/server/am/ActiveServicesTest.java
index a373fcc..5cd9f98 100644
--- a/services/tests/mockingservicestests/src/com/android/server/am/ActiveServicesTest.java
+++ b/services/tests/mockingservicestests/src/com/android/server/am/ActiveServicesTest.java
@@ -15,6 +15,7 @@
  */
 package com.android.server.am;
 
+import static com.android.dx.mockito.inline.extended.ExtendedMockito.mockitoSession;
 import static com.android.dx.mockito.inline.extended.ExtendedMockito.when;
 import static com.android.internal.app.procstats.ProcessStats.ADJ_MEM_FACTOR_CRITICAL;
 import static com.android.internal.app.procstats.ProcessStats.ADJ_MEM_FACTOR_LOW;
@@ -88,6 +89,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
+import org.mockito.MockitoSession;
 import org.mockito.quality.Strictness;
 
 import java.lang.reflect.Field;