Merge "Put media.metrics service into proper group" into oc-dev am: 0990056439
am: 337a3fbbfc

Change-Id: Ib696c714a44a4f81fa87a2390794b51b3c16474b