Merge "Insufficient ProcessRecord cleanup when persistent process is killed"

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

@@ -12435,6 +12435,7 @@ public final class ActivityManagerService extends ActivityManagerNative
         app.foregroundActivities = false;
         app.hasShownUi = false;
         app.hasAboveClient = false;
+        app.hasClientActivities = false;
 
         mServices.killServicesLocked(app, allowRestart);