Merge "Begin disconnecting KeyguardStatusViewController from NPVC" into udc-qpr-dev am: 5b0bec26d4

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

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