Merge "Trace registrations of content observers" into main

import android.os.UserHandle;

import android.provider.Settings;

import com.android.app.tracing.TraceUtils;

import com.android.systemui.settings.UserTracker;

import kotlin.Unit;

/**

 * Used to interact with per-user Settings.Secure and Settings.System settings (but not

 * Settings.Global, since those do not vary per-user)

    default void registerContentObserverForUser(

            Uri uri, boolean notifyForDescendants, ContentObserver settingsObserver,

            int userHandle) {

        TraceUtils.trace(

                () -> {

                    // The limit for trace tags length is 127 chars, which leaves us 90 for Uri.

                    return "USP#registerObserver#[" + uri.toString() + "]";

                }, () -> {

                    getContentResolver().registerContentObserver(

                uri, notifyForDescendants, settingsObserver, getRealUserHandle(userHandle));

                            uri, notifyForDescendants, settingsObserver,

                            getRealUserHandle(userHandle));

                    return Unit.INSTANCE;

                });

    }

    /**