Merge "WifiInfo: API changes to conform with connectivity API changes"