Merge "audiopolicy: fix attributes match helper function" into qt-dev