Merge "metricsd: Remove dead code." am: 695da48944
am: a3e097c9ca

* commit 'a3e097c9ca4800a7c9460a77be98007d9b389221':
  metricsd: Remove dead code.