Merge "Fix force close in WiFi API test code" into main am: 4f52f40c am: 8871bd5b

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



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