Merge "Renaming to `initial` TaskFragment token" into sc-v2-dev

        // A reusable token for other purposes, e.g. content capture, translation. It shouldn't be

        // used without security checks

        public IBinder shareableActivityToken;

        // The token of the TaskFragment that embedded this activity.

        @Nullable public IBinder mTaskFragmentToken;

        // The token of the initial TaskFragment that embedded this activity. Do not rely on it

        // after creation because the activity could be reparented.

        @Nullable public IBinder mInitialTaskFragmentToken;

        int ident;

        @UnsupportedAppUsage

        Intent intent;

                boolean isForward, ProfilerInfo profilerInfo, ClientTransactionHandler client,

                IBinder assistToken, FixedRotationAdjustments fixedRotationAdjustments,

                IBinder shareableActivityToken, boolean launchedFromBubble,

                IBinder taskFragmentToken) {

                IBinder initialTaskFragmentToken) {

            this.token = token;

            this.assistToken = assistToken;

            this.shareableActivityToken = shareableActivityToken;

            mActivityOptions = activityOptions;

            mPendingFixedRotationAdjustments = fixedRotationAdjustments;

            mLaunchedFromBubble = launchedFromBubble;

            mTaskFragmentToken = taskFragmentToken;

            mInitialTaskFragmentToken = initialTaskFragmentToken;

            init();

        }

    private TaskFragmentContainer getContainerWithActivity(@NonNull IBinder activityToken,

            Activity activityToAdd) {

        final IBinder taskFragmentToken = ActivityThread.currentActivityThread().getActivityClient(

                activityToken).mTaskFragmentToken;

                activityToken).mInitialTaskFragmentToken;

        for (TaskFragmentContainer container : mContainers) {

            if (container.hasActivity(activityToken)) {

                return container;