Merge "metricsd: Split into two daemons." am: f3f2c63adb
am: b84b7c79a0

* commit 'b84b7c79a062c7f27480eefbcdbd60606e4a6dde':
  metricsd: Split into two daemons.