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

Change-Id: I9bfcb96425890dc9de8c7f8b657b5b9487b7ea61