Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev

Author: ogunwale

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

@@ -240,8 +240,12 @@ boolean cleanupDisabledPackageReceiversLocked(
                 }
                 didSomething = true;
                 receivers.remove(i);
+                if (i < nextReceiver) {
+                    nextReceiver--;
+                }
             }
         }
+        nextReceiver = Math.min(nextReceiver, receivers.size());
 
         return didSomething;
     }