Merge "drm: edid: add support for parsing additional EDID blocks" into msm-4.9