Merge "WifiInfo: Changes to remove dep on connectivity" am: f22bffd4bb am: a235eebf7f

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

Change-Id: Iecf69b9ae37c798c4735660fc729b6eb460eee5b