Merge "Optionally hide default keygaurd weather view" into udc-dev am: 6eb183ba am: a69ed26e

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



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