Add comments to avoid merge conflicts

    private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,

            Activity activity, Lifecycle lifecycle, DevelopmentSettingsDashboardFragment fragment) {

        final List<AbstractPreferenceController> controllers = new ArrayList<>();

        // take bug report

        // desktop backup password

        controllers.add(new StayAwakePreferenceController(context, lifecycle));

        // hdcp checking

        controllers.add(new BluetoothSnoopLogPreferenceController(context));

        controllers.add(new OemUnlockPreferenceController(context, activity, fragment));

        // running services

        // convert to file encryption

        // picture color mode

        // webview implementation

        // cool color temperature

        // automatic system updates

        // system ui demo mode

        // quick settings developer tiles

        // usb debugging

        // revoke usb debugging authorizations

        // local terminal

        // bug report shortcut

        // select mock location app

        // enable view attribute inspection

        // select debug app

        // wait for debugger

        // verify apps over usb

        // logger buffer sizes

        // store logger data persistently on device

        // telephony monitor

        // camera laser sensor

        // camera HAL HDR+

        // feature flags

        // wireless display certification

        // enable wi-fi verbose logging

        // aggressive wifi to mobile handover

        // always allow wifi roam scans

        // mobile always active

        // tethering hardware acceleration

        // select usb configuration

        // show bluetooth devices without names

        // disable absolute volume

        // enable in-band ringing

        // bluetooth avrcp version

        // bluetooth audio codec

        // bluetooth audio sample rate

        // bluetooth audio bits per sample

        // bluetooth audio channel mode

        // bluetooth audio ldac codec: playback quality

        // show taps

        // pointer location

        // show surface updates

        // show layout bounds

        // force rtl layout direction

        // window animation scale

        // transition animation scale

        // animator duration scale

        // simulate secondary displays

        // smallest width

        // force gpu rendering

        // show gpu view updates

        // show hardware layers updates

        // debug gpu overdraw

        // debug non-rectangular clip operations

        // force 4x msaa

        // disable hw overlays

        // simulate color space

        // set gpu renderer

        // disable usb audio routing

        // strict mode enabled

        // profile gpu rendering

        // don't keep activities

        // background process limit

        // background check

        // show all anrs

        // show notification channel warnings

        // inactive apps

        // force allow apps on external

        // force activities to be resizable

        // reset shortcutmanager rate-limiting

        return controllers;

    }