Merge branch '3414-a15-fix_header' into 'a15'

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.widget.LinearLayout;

import androidx.fragment.app.Fragment;

import androidx.preference.Preference;

            // Use the dividers in SetupWizardRecyclerLayout. Suppress the dividers in

            // PreferenceFragment.

            setDivider(null);

            final LinearLayout headerLayout = layout.findManagedViewById(com.google.android.setupdesign.R.id.sud_layout_header);

            if (headerLayout != null) {

                headerLayout.setPadding(0, layout.getPaddingTop(), 0,

                        layout.getPaddingBottom());

            }

        }

        @Override