Cumulative patch from upstream commit 05a5267 am: 96739d9bc2 am: eff07c06b5 am: 17ccdf10a8

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iw/+/18168734

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