Merge "Update audio policy for USB" into lmp-dev