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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24422641

Change-Id: Id35aa0983e20970148b6ff46b829ee8bdf09f323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>