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

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

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