Merge "Convert from Handlers to Executors in NotificationLockscreenUserManager" into main