Merge "audio policy: fix scanning of supported devices" into jb-mr1-dev