Merge "Fix package name reporting in MediaDrm metrics." into oc-mr1-dev