Merge "Add StatsdStats in statsd's dumpsys"