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

* commit '51cb521d8d755dc2b163f3d5a2b35db4ca51407f':
  metricsd: Split into two daemons.