Merge "Update the card preference buttons margin" into udc-dev

            android:id="@+id/card_preference_buttons"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="24dp"

            android:layout_marginTop="10dp"

            android:layout_below="@android:id/summary"

            android:visibility="gone">

            <Button