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

Change-Id: Ia9ac14ccdfb4bd226d6091d4266f8186462a17b1