Merge "reduce metrics data for 'audiopolicy'" into pi-dev