Merge "wifi: Fix single AP iface isn't deleted" into udc-dev am: 5d806f5a...

Merge "wifi: Fix single AP iface isn't deleted" into udc-dev am: 5d806f5a am: 46bada49 am: c61a5930 am: 16ad9ba8

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



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