[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: b7fdde4e85 -s ours am: 3d50b71baf -s ours

am skip reason: Merged-In Ia33d3b4e48dd56a5fb44da140d75d69f898f8da4 with SHA-1 6b2ed76b5f is already in history

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

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