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

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

Change-Id: I15fa3488be8ab261e5d7e84c0d6afa8f648b4e22