Merge "audiopolicy: fix preferred device selection" into pi-dev