Merge "wifi: Fix single AP iface isn't deleted" into udc-dev am: 5d806f5adb am: 780ed94a28 am: 527fdbed7d

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

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