Merge "audiopolicy: engine: anticipate usage deprecation"