Merge "Change audio routing policy for HDMI"