[automerger skipped] Merge "Replace StatusBarKeyguardViewManager with KeyguardViewController" into sc-v2-dev am: 77642029bf -s ours
am skip reason: Merged-In I07739b5763f78580475476aa81d5d1297f956fde with SHA-1 f2f306e68c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16737208
Change-Id: I5e9f7e812eefd0afe0a90626d33b77d60990d494
This commit is contained in: