Merge "Update wi-fi hotspot min length of summary to 2" into pi-dev

    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/tether_settings_title_all">

    <Preference

    <com.android.settings.widget.FixedLineSummaryPreference

        android:key="wifi_tether"

        android:title="@string/wifi_hotspot_checkbox_text"

        android:summary="@string/summary_two_lines_placeholder"

        android:fragment="com.android.settings.wifi.tether.WifiTetherSettings" />

        android:fragment="com.android.settings.wifi.tether.WifiTetherSettings"

        settings:summaryLineCount="2" />

    <SwitchPreference

        android:key="usb_tether_settings"