Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig"