Merge "audio policy: fix volume control regression" into nyc-dev