[automerger skipped] Merge "Replace StatusBarKeyguardViewManager with...

[automerger skipped] Merge "Replace StatusBarKeyguardViewManager with KeyguardViewController" into sc-v2-dev am: 77642029 -s ours am: d985a035 -s ours

am skip reason: Merged-In I07739b5763f78580475476aa81d5d1297f956fde with SHA-1 f2f306e6 is already in history

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

Change-Id: I47600e9c2f39e935c085239188c11ea567536a05