[automerger skipped] Merge "Unregister mShowWeatherObserver when KeyguardClockSwitchController is detached" into udc-dev am: fe4e586e2e am: 18ffecdaf9 -s ours

am skip reason: Merged-In I8807d1d58b58f1e5c990c21cef6a810e8b13c1db with SHA-1 89de5a4947 is already in history

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

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