Merge "android.hardware.graphics.common V4 += Hdr type"