Merge "Skip ANR for processes that have been killed"

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

@@ -753,6 +753,9 @@ class AppErrors {
             } else if (app.crashing) {
                 Slog.i(TAG, "Crashing app skipping ANR: " + app + " " + annotation);
                 return;
+            } else if (app.killedByAm) {
+                Slog.i(TAG, "App already killed by AM skipping ANR: " + app + " " + annotation);
+                return;
             }
 
             // In case we come through here for the same app before completing