Merge "audio policy: clean up initial spatializer audio patch" into main