[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am:...

[automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210605.005" am: d83838d9 -s ours am: badb90b5 -s ours

am skip reason: Merged-In I329e495f244ca88a6614fab3556eb1267720d35f with SHA-1 65199c0c is already in history

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

Change-Id: I1ed6a70ff6b03fcbe174d5bc53aad63803835ea5