Merge "Remove no-op setListener method from dumpstate listener"