Merge "plat/arm/sgi: fix the incorrect check for SCMI channel ID" into integration