Merge "Handle "--user current" and other valid users in the AccountManagerServiceShellCommand."