Merge "ActivityManagerShellCommand calls getUserSwitchability with wrong user"