Fix no KeyguardStatusView on lock screen am: 22a121bf91 am: c9cef27613 am: 6abb7fd6b4

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

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