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

Change-Id: I3d80f17486f482df6492625518c77ce194c73421