WifiInfo: Changes to remove dep on connectivity

Changes to help submit the dependent connectivity CL in AOSP.

Bug: 156867433
Bug: 162602799
Test: Compiles
Change-Id: I75e3ffec5a4f5c1f8216672711cbce6328bb8d4f
Merged-In: I89d1685c5159f38fa4245b7291456e9d594cb808
2 files changed