Merge "Make sure FP error text is visible in landscape"

                <com.android.setupwizardlib.view.FillContentLayout

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_height="0dp"

                    android:layout_marginVertical="24dp"

                    android:layout_weight="1"

                    android:paddingTop="0dp"

                    android:paddingBottom="0dp"

                    android:layout_marginVertical="24dp">

                    android:paddingBottom="0dp">

                    <include layout="@layout/fingerprint_enroll_enrolling_content"

                         android:layout_width="match_parent"