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