Tether screen cleanup

    <SwitchPreference

        android:key="enable_wifi_ap"

        android:title="@string/wifi_tether_checkbox_text" />

        android:title="@string/wifi_tether_checkbox_text"

        android:summary="@string/summary_two_lines_placeholder" />

    <Preference

        android:key="wifi_ap_ssid_and_security"

        android:key="enable_bluetooth_tethering"

        android:title="@string/bluetooth_tether_checkbox_text" />

    <com.android.settings.DividerPreference

    <Preference

        android:key="disabled_on_data_saver"

        android:summary="@string/tether_settings_disabled_on_data_saver"

        android:selectable="false"

import android.os.UserManager;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;

import android.util.Log;

import com.android.internal.logging.nano.MetricsProto.MetricsEvent;