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

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



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