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

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



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