[automerger skipped] Merge "Unregister mShowWeatherObserver when...

[automerger skipped] Merge "Unregister mShowWeatherObserver when KeyguardClockSwitchController is detached" into udc-dev am: fe4e586e am: 18ffecda am: 25223079 -s ours am: 53f8dcf3 -s ours

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

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



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