Merge "TestOnly: getting WifiInfo with NETWORK_SETTINGS" am: 119407ab8f am: cdd3a615f8

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

Change-Id: I7ba62a846d18316ef246f370946635ac1300d358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>