Merge "Give media.metrics service access to uid/pkg info" into oc-mr1-dev am: 123cf237b7
am: 91306800e7

Change-Id: Ia7bc742ded9f4d2aa196e058e31935faf9c98759