Merge "Fixed SystemService.dumpSupportedUsers()"