Merge "Fix multiuser.UserLifecycleTests dummy app"