Merge "Remove use of SkGainmapInfo::Type" into main