Merge "Revert "Remove KeyguardHostView"" into tm-qpr-dev am: da5de14a am: 5f5e8c18

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



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