Merge "Revert "Pass token to AutoFillUI.""

        final int mId;

        private Session(int id, IBinder activityToken) {

            mUi = new AutoFillUI(mContext, this, activityToken);

            mUi = new AutoFillUI(mContext, this);

            mId = id;

            mActivityToken = new WeakReference<>(activityToken);

        }

import android.graphics.PixelFormat;

import android.os.Binder;

import android.os.Bundle;

import android.os.IBinder;

import android.util.Slog;

import android.view.autofill.AutoFillId;

import android.view.autofill.Dataset;

    private final Context mContext;

    private final Session mSession;

    private final IBinder mAppToken;

    private final WindowManager mWm;

    // Fill UI variables

     */

    private View mSnackbar;

    AutoFillUI(Context context, Session session, IBinder appToken) {

    AutoFillUI(Context context, Session session) {

        mContext = context;

        mSession = session;

        mAppToken = appToken;

        mWm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);

    }