Merge "Fix overlapping in TrustedCredentialsSettings"

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

              android:layout_width="match_parent"

              android:layout_height="match_parent"

              android:clipToPadding="true"

              android:clipChildren="true"

              android:orientation="vertical">

    <LinearLayout

        android:id="@+id/header_view"