Merge "track pkgname/version in media.metrics" into oc-mr1-dev
am: dbedf0ab12

Change-Id: I57b07ed336fd60e326fad48206cad5fa19268d82