Merge "Fix package name reporting in MediaDrm metrics." into oc-mr1-dev
am: 7dca8d7587

Change-Id: Id5828b367bf7bb31d989be52330ae1e23220d809