Cumulative patch from upstream commit 5909e73 am: 44e0e5863b

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

Change-Id: Iaf2d033e970a8b8aa9c8f3cc22f7688c5466c8a5