Merge "Add skip button to fingerprint settings" into nyc-mr1-dev

        <!-- Both texts are kept as separate text views so it doesn't jump around in portrait.

             See layouts/fingerprint_enroll_enrolling_base.xml. -->

        <FrameLayout

        <RelativeLayout

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical">

            android:layout_height="wrap_content">

            <TextView

                style="@style/TextAppearance.FingerprintMessage"

                android:id="@+id/start_message"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_alignParentTop="true"

                android:text="@string/security_settings_fingerprint_enroll_start_message"/>

            <TextView

                android:id="@+id/repeat_message"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_alignParentTop="true"

                android:text="@string/security_settings_fingerprint_enroll_repeat_message"

                android:visibility="invisible"/>

        </FrameLayout>

            <Button

                android:id="@+id/skip_button"

                style="@style/SetupWizardButton.Negative"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_alignParentBottom="true"

                android:layout_marginBottom="8dp"

                android:text="@string/skip_label"

                android:visibility="gone" />

        </RelativeLayout>

        <FrameLayout

            android:layout_width="0dp"