Merge "Avoid NPE in system_server in bringDownServiceLocked()" am: 967232eef3 am: d675648673

Change-Id: I76faa08f32a5944429a6db854e01435b44eb1f34

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

@@ -2935,7 +2935,9 @@ public final class ActiveServices {
                     } catch (Exception e) {
                         Slog.w(TAG, "Exception when unbinding service "
                                 + r.shortInstanceName, e);
+                        needOomAdj = false;
                         serviceProcessGoneLocked(r);
+                        break;
                     }
                 }
             }