Merge "Fix warning in audio policy service" into nyc-dev