Merge "Ensure package broadcast whitelist is AppIds" into rvc-dev am: 3c94f71398 am: 019cdf8d52

Change-Id: I0b515a71d3c12a8de41b00b47a8ac10f9856472d

services/core/java/com/android/server/pm/AppsFilter.java

@@ -612,7 +612,7 @@ public class AppsFilter {
                     }
                     final int insert = ~loc;
                     System.arraycopy(appIds, insert, buffer, 0, whitelistSize - insert);
-                    appIds[insert] = existingUid;
+                    appIds[insert] = existingAppId;
                     System.arraycopy(buffer, 0, appIds, insert + 1, whitelistSize - insert);
                     whitelistSize++;
                 }