[automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: 64500046a9 -s ours am: cc730ec4a1 -s ours am: 526dbaecb4 -s ours

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

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

Change-Id: I582ab07ba12204e66e5d13a044a3bd7d18707961
tree: da3ee62e9867de1795f0708725b2dbebce7184c3
  1. Android.mk
  2. METADATA
  3. OWNERS
  4. cld80211-lib/
  5. qcwcn/