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

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

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