Merge "Revert^2 "Remove temp user creation activity"" into tm-dev

                .setPackage(mCreateSupervisedUserPackage)

                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        // TODO(b/209659998): [to-be-removed] fallback activity for supervised user creation.

        if (mContext.getPackageManager().resolveActivity(intent, 0) == null) {

            intent.setPackage(null)

                    .setClassName("com.android.settings",

                        "com.android.settings.users.AddSupervisedUserActivity");

        }

        mContext.startActivity(intent);

    }