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

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

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

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



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