Merge "Pass callingPackage in UserLifecycleTest#startApp"

     */

    private void startApp(int userId, String packageName) throws RemoteException {

        final Context context = InstrumentationRegistry.getContext();

        final WaitResult result = ActivityTaskManager.getService().startActivityAndWait(null, null,

                context.getPackageManager().getLaunchIntentForPackage(packageName),

                null, null, null, 0, 0, null, null,

                userId);

        final WaitResult result = ActivityTaskManager.getService().startActivityAndWait(null,

                context.getPackageName(),

                context.getPackageManager().getLaunchIntentForPackage(packageName), null, null,

                null, 0, 0, null, null, userId);

        attestTrue("User " + userId + " failed to start " + packageName,

                result.result == ActivityManager.START_SUCCESS);

    }