Merge "wifi: Fix single AP iface isn't deleted" into tm-dev am: 3adf36824f am: 501c9b818c am: f5170e8c3e am: 091ff3c8aa

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

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