Merge "Unregister mShowWeatherObserver when KeyguardClockSwitchController is detached" into udc-qpr-dev am: 9a3027b93b am: 82acc01530

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

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