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

Change-Id: I77c8793363ad2e3736ca587070b1cbd119168f53