[automerger skipped] Merge "sysui: Observe weather enabled for lockscreen."...

[automerger skipped] Merge "sysui: Observe weather enabled for lockscreen." into tm-qpr-dev am: 823d9207 -s ours am: da28da85 -s ours

am skip reason: Merged-In I7a7830cb8875d74a447b3ee07105899418a084c4 with SHA-1 1a31b9df is already in history

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



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