Merge "Fix null pointer WifiInfo" into udc-dev am: abed5f9a2f

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

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