Merge "passpoint-r2: change return type of getMatchingOsuProviders"