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

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

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