Cumulative patch from upstream commit 5909e73 am: 44e0e5863b Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iw/+/17093435 Change-Id: Ifd974aeb7f758950ed7f8dda01a5e74f397855c2