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

Change-Id: I65313c7b1add7b3346308042df8cadc8d7f18903