Merge "wifi: hotspot2: Passpoint configuration APIs update"