Merge changes from topic "presubmit-am-5f71c0c2e4404f4483b93bae95744fe7" into tm-mainline-prod

* changes:
  [automerge] Fix potential StrictMode crash with miniresolver 2p: d0978dbb67
  Fix potential StrictMode crash with miniresolver

core/java/com/android/internal/app/ResolverActivity.java

@@ -1480,7 +1480,7 @@ public class ResolverActivity extends Activity implements
             if (intent != null) {
                 prepareIntentForCrossProfileLaunch(intent);
             }
-            safelyStartActivityInternal(otherProfileResolveInfo,
+            safelyStartActivityAsUser(otherProfileResolveInfo,
                     mMultiProfilePagerAdapter.getInactiveListAdapter().mResolverListController
                             .getUserHandle());
         });