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

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

Change-Id: Ie630a0243fbcf8fb5749c2358494c89bc9a48df6