[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64500046...

[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64500046 -s ours am: cc730ec4 -s ours am: 526dbaec -s ours am: 76f69d48 -s ours am: 38c4d169 -s ours am: 7f6fdbfb -s ours

am skip reason: Change-Id I4ac4d460106ac3b242e9bfd714e1dedb5b9bbd67 with SHA-1 650e783d is in history

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

Change-Id: I6970cf5994aae7510cfd93a4db798c91fda01e57