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

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



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