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

Change-Id: Ic914228c52f19b2f745541aa5edd12bbd2f66419