[automerger skipped] Merge "WifiInfo: Changes to remove dep on connectivity" am: f22bffd4bb am: a235eebf7f am: 2e97c47c58 -s ours

am skip reason: skip tag Change-Id I89d1685c5159f38fa4245b7291456e9d594cb808 with SHA-1 e16f0d4758 is already in history

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

Change-Id: I5238c6df253ced91133b41b8c1a1e240aaa0b65e