Merge "DrmManager: record usage with libmediametrics"