Merge "Workaround a bug that causes multiple activity instances are created"

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

@@ -652,6 +652,7 @@ public class LauncherAppsService extends SystemService {
                             activityInfo.name.equals(component.getClassName())) {
                         // Found an activity with category launcher that matches
                         // this component so ok to launch.
+                        launchIntent.setPackage(null);
                         launchIntent.setComponent(component);
                         mContext.startActivityAsUser(launchIntent, opts, user);
                         return;

services/core/java/com/android/server/pm/crossprofile/CrossProfileAppsServiceImpl.java

@@ -111,6 +111,7 @@ public class CrossProfileAppsServiceImpl extends ICrossProfileApps.Stub {
 
         final long ident = mInjector.clearCallingIdentity();
         try {
+            launchIntent.setPackage(null);
             launchIntent.setComponent(component);
             mContext.startActivityAsUser(launchIntent,
                     ActivityOptions.makeOpenCrossProfileAppsAnimation().toBundle(), user);