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

* commit '23047512e8fef0ba1ccd5869f93e6ef0e54dd2de':
  metricsd: Report the model manifest id.