Merge "Skip user restriction check on desktop" into main

package com.android.settings;

import static com.android.settings.SettingsActivity.EXTRA_FRAGMENT_ARG_KEY;

import static com.android.settingslib.media.PhoneMediaDevice.isDesktop;

import android.app.Activity;

import android.app.Dialog;

    /** Returns if catalyst is enabled on current screen. */

    protected final boolean isCatalystEnabled() {

        // TODO(b/379130874): make Catalyst compatible with desktop device, such as user restriction

        // check.

        Context context = getContext();

        if (context != null && isDesktop(context)) {

            return false;

        }

        return getPreferenceScreenCreator() != null;

    }