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

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



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