Merge "Replace StatusBarKeyguardViewManager with KeyguardViewController" into tm-dev am: dc25f23c am: 95b67450 am: 748270e7

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



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