[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am:...

[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: b7fdde4e -s ours am: 3d50b71b -s ours am: f21eacd1 -s ours

am skip reason: Merged-In Ia33d3b4e48dd56a5fb44da140d75d69f898f8da4 with SHA-1 6b2ed76b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/15571732

Change-Id: I1983e023799d95af29e379c798849e17c39d9292