Fix small mismerge in SystemServer.java