Cumulative patch from upstream commit 05a5267 am: 96739d9bc2

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

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