Merge "Back up / restore the "Avoid poor connections" wifi setting" into jb-mr1-dev

Author: Christopher Tate

core/java/android/provider/Settings.java

@@ -5321,6 +5321,7 @@ public static final String getBluetoothInputDevicePriorityKey(String address) {
             ENABLE_ACCESSIBILITY_GLOBAL_GESTURE_ENABLED,
             WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
             WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY,
+            WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED,
             WIFI_NUM_OPEN_NETWORKS_KEPT,
             EMERGENCY_TONE,
             CALL_AUTO_RETRY,