Merge "WifiInfo: API changes to conform with connectivity API changes" am: 20ad12beb9

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Wifi/+/1645929

Change-Id: Ibe3163e85a04c23071ebbed40314179931ebc338