Merge "hotspot2: update PasspointConfiguration APIs"