[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 0b2dbb4621 -s ours

am skip reason: Change-Id I02faff3060bda901a2315693d8921c9280dc84bf with SHA-1 526dbaecb4 is in history

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

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