WifiInfo: Cherry pick redaction CL's

Needed for connectivity team to write CTS tests.

Bug: 156867433
Bug: 183429728
Test: atest android.net.wifi
Test: atest com.android.server.wifi

Merged-In: I7c0e45736a986ab33055dfc0f43cad2c5aa8343a
Change-Id: I7c0e45736a986ab33055dfc0f43cad2c5aa8343a
5 files changed