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

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

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