Reconcile with ics-mr1-release

Change-Id: I84213bb4f44dbb3fbe69d5f79cda246552535059
diff --git a/src/com/android/settings/LocationSettings.java b/src/com/android/settings/LocationSettings.java
index ef438e6..fe2052c 100644
--- a/src/com/android/settings/LocationSettings.java
+++ b/src/com/android/settings/LocationSettings.java
@@ -123,8 +123,9 @@
                     updateLocationToggles();
                 }
             };
-            mContentQueryMap.addObserver(mSettingsObserver);
         }
+
+        mContentQueryMap.addObserver(mSettingsObserver);
     }
 
     @Override