Merge "Honor HDMI_CONTROL_ENABLED setting in AudioService"