Merge "qti: spmi_arb: Fix NUM_APID and REG_APID_MAP() argument" into integration