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

Change-Id: I97060dfe445f734a181b52972b7628376cef0f58