Merge "audio policy service: fix spatializer locking scheme" into tm-qpr-dev