Merge "Revert "audiopolicy: speaker cleanup AudioAttributes usage"" into main