Merge "Passpoint-r2: set provider name for OSU AP in WifiInfo"