Merge "Filter instant apps with different names" into oc-dev

am: adcc94f160

Change-Id: I855a58e6ea0655b4211f2aac0a4a1f9f94f639f2

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

@@ -7207,12 +7207,15 @@ public class PackageManagerService extends IPackageManager.Stub
                     // load resources from the correct package
                     installerInfo.resolvePackageName = info.getComponentInfo().packageName;
                     resolveInfos.set(i, installerInfo);
+                    continue;
                 }
-                continue;
             }
             // caller is a full app, don't need to apply any other filtering
             if (ephemeralPkgName == null) {
                 continue;
+            } else if (ephemeralPkgName.equals(info.activityInfo.packageName)) {
+                // caller is same app; don't need to apply any other filtering
+                continue;
             }
             // allow activities that have been explicitly exposed to ephemeral apps
             if (!isEphemeralApp