Merge "Make persistent apps become top correctly." into nyc-dev

am: 29af3cab29

* commit '29af3cab293dc7a19ca3b387c5507e521f66d0b7':
  Make persistent apps become top correctly.

Change-Id: I3cce5f530659bf2355f79ebcd323ab79137aec92

services/core/java/com/android/server/am/ActivityManagerService.java

@@ -18549,6 +18549,8 @@ public final class ActivityManagerService extends ActivityManagerNative
             app.systemNoUi = true;
             if (app == TOP_APP) {
                 app.systemNoUi = false;
+                app.curSchedGroup = ProcessList.SCHED_GROUP_TOP_APP;
+                app.adjType = "pers-top-activity";
             } else if (activitiesSize > 0) {
                 for (int j = 0; j < activitiesSize; j++) {
                     final ActivityRecord r = app.activities.get(j);