Merge "Unregister mShowWeatherObserver when KeyguardClockSwitchController is detached" into udc-dev

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java

@@ -266,6 +266,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
         setClock(null);
 
         mSecureSettings.unregisterContentObserver(mDoubleLineClockObserver);
+        mSecureSettings.unregisterContentObserver(mShowWeatherObserver);
 
         mKeyguardUnlockAnimationController.removeKeyguardUnlockAnimationListener(
                 mKeyguardUnlockAnimationListener);