Merge "audiopolicy: treat HDMI as part of last connected  media device" into main