Merge "feat(plat/sgi): enable use of PSCI extended state ID format" into integration