Merge "Split ShellCommand implementation out of UserManagerService"