Merge "msm: mdss: hdmi: clean up cn/itc bit set/unset"