Merge "[Settings] Enable some compatibility with Material 3"

    <style name="Theme.Settings.NoActionBar">

        <item name="android:windowActionBar">false</item>

        <item name="android:windowNoTitle">true</item>

        <item name="colorSurface">@color/settingslib_colorSurface</item>

    </style>

    <style name="Theme.SubSettings.Base" parent="Theme.Settings.NoActionBar">