Merge "audio policy: add device to audio record media metrics" into pi-dev
am: 1ea2c0f91c

Change-Id: Ic9cacf6f5b2b9f3aa51367914f71c8c03592a415