Merge "Add date(+weather)(+alarm+dnd) view to lockscreen if decoupling enabled." into tm-qpr-dev am: 2bde1bdcce

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

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