[automerger skipped] WifiInfo: Cherry pick redaction CL's am: cc0e443734 am: 28b8b322d4 am: 853b7c39ed -s ours

am skip reason: skip tag Change-Id I7c0e45736a986ab33055dfc0f43cad2c5aa8343a with SHA-1 95af04b58b is already in history

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

Change-Id: I9c7f952344724b29655c656e43ffcb5b90944e18