Merge "rkp_factory_extraction_tool: append drm CSRs" into main