Merge "Revert getMatchingOsuProviders(List<ScanResult>) API referencing hidden type"