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

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

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



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