Merge change 1957 into donut

    <bool name="def_bluetooth_on">false</bool>

    <bool name="def_install_non_market_apps">false</bool>

    <!-- Comma-separated list of providers. -->

    <string name="def_location_providers_allowed">network</string>

    <!-- Comma-separated list of location providers. 

         Network location is off by default because it requires

         user opt-in via Setup Wizard or Settings.  

    -->

    <string name="def_location_providers_allowed">gps</string>

    <!--  0 == mobile, 1 == wifi. -->

    <integer name="def_network_preference">1</integer>

    <bool name="def_usb_mass_storage_enabled">true</bool>