Merge "Revert "audio policy: refine strategy invalidation logic""