Move "scanning" from location setting actionbar to pref xml

This fixes the breadcrumb for scanning settings when you search "scan".

- Also did some minor cleanup in LocationSettings (creating preference
using the correct context)

Change-Id: I8efc62246f2e18b2bd4b5eb411b40f24e36b0f2a
Fix: 36529569
Test: manual

res/values/strings.xml

@@ -3099,9 +3099,6 @@
     <string name="location_mode_battery_saving_description">Use Wi\u2011Fi, Bluetooth, or mobile networks to determine location</string>
     <!-- [CHAR LIMIT=130] Location mode screen, description for sensors only mode -->
     <string name="location_mode_sensors_only_description">Use GPS to determine location</string>
-    <!-- Help menu label [CHAR LIMIT=20] Location settings screen, overflow menu that takes the user
-      to scanning settings activity -->
-    <string name="location_menu_scanning">Scanning</string>
     <!-- [CHAR LIMIT=30] Wireless background scanning settings screen, screen title -->
     <string name="location_scanning_screen_title">Scanning</string>
     <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->

res/xml/location_settings.xml

@@ -44,6 +44,11 @@
             </intent>
         </Preference>
 
+        <Preference
+            android:key="location_scanning"
+            android:title="@string/location_scanning_screen_title"
+            android:fragment="com.android.settings.location.ScanningSettings"/>
+
         <PreferenceCategory
             android:key="recent_location_requests"
             android:title="@string/location_category_recent_location_requests" />

res/xml/security_settings_misc.xml

@@ -22,8 +22,8 @@
 
         <Preference
             android:key="location"
-            android:title="@string/location_settings_title">
-            <intent android:action="android.settings.LOCATION_SOURCE_SETTINGS"/>
+            android:title="@string/location_settings_title"
+            android:fragment="com.android.settings.location.LocationSettings">
         </Preference>
 
         <SwitchPreference