Merge "[audiopolicy] fix -Wreorder-init-list"