Merge changes I4a979715,I167b23a5

* changes:
  Move NotificationLockscreenUserManager out of NSSL
  Stop injection KeyguardBypassController into NSSL