Merge "drm_hwcomposer: fill hwc_display_contents retireFenceFd" into mnc-dr-dev