Merge "Remove KeyguardHostView" into tm-qpr-dev am: 56e67e63e1

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

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