Merge "MediaMetricsService: accept mediadrm.* records"