[automerger skipped] Merge "Merge Android R" am: 7bddc5a998 -s ours am: e6a92a64e4 -s ours am: 29911e94bc -s ours am: 5ec0ee2680 -s ours

am skip reason: Change-Id I3a68890be6d2c62299703dea85b8aad11771e5bc with SHA-1 0b2dbb4621 is in history

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

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