Merge "Fix force close in WiFi API test code" into main am: 4f52f40cf9

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3534241

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