Merge "fix persistent process is killed and restart again and again" am: ae302cef52

am: b322dc384e

Change-Id: Ie1802af0a6f22cb69c3b62f0912363a299f8f453

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

@@ -11465,6 +11465,7 @@ public final class ActivityManagerService extends ActivityManagerNative
                 && userId == UserHandle.USER_SYSTEM
                 && (info.flags & PERSISTENT_MASK) == PERSISTENT_MASK) {
             r.persistent = true;
+            r.maxAdj = ProcessList.PERSISTENT_PROC_ADJ;
         }
         addProcessNameLocked(r);
         return r;