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

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

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