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

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

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