Merge "Delete unused code from NotifLockscreenUserManager" into tm-qpr-dev