Merge "wifi: Fix single AP iface isn't deleted" into udc-dev am: 5d806f5adb am: 46bada49a0

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/23520926

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