Merge "audio policy: use audio_devices_t when appropriate"