Fix no KeyguardStatusView on lock screen am: 22a121bf91 am: 5094872bf9

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

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