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: I1f39e5ee10038113a3345db9bb357bfe411b3c24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>