Merge "Fix no KeyguardStatusView on lock screen" into udc-qpr-dev am: 6168c6ee am: dbb63b32

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



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