[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am:...

[automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: 830cb6b3 -s ours am: 87128f7c -s ours

am skip reason: Change-Id Ief2d409729de9413224773906ff892ea62893635 with SHA-1 22088b81 is in history

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

Change-Id: Ib03931ca6943fbce78affdddd9ae262c1542ec72