Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig"

                        // the given ScanResult.  This is used for showing that a given AP

                        // (ScanResult) is available via a Passpoint provider (provider friendly

                        // name).

                        try {

                            WifiConfiguration config = mWifiManager.getMatchingWifiConfig(result);

                            if (config != null) {

                                accessPoint.update(config);

                            }

                        } catch (UnsupportedOperationException e) {

                            // Passpoint not supported on the device.

                        }

                    }

                    accessPoints.add(accessPoint);