Merge "[Passpoint] Fix credential unique ID calculation" into rvc-dev