Merge changes from topic "presubmit-am-b4fb8f57ee1646d4b98b58ae2008c663" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Replace StatusBarKeyguardViewManager with KeyguardViewController 2p: f2f306e68c
  Replace StatusBarKeyguardViewManager with KeyguardViewController