Merge "metricsd: Report the model manifest id." am: 605f2f024b
am: 475baee4e2

* commit '475baee4e2597475719d510629267955138ef7f4':
  metricsd: Report the model manifest id.