Merge "wifi: Fix single AP iface isn't deleted" into tm-dev am: 3adf3682

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



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