[automerger skipped] Merge "Merge Android R" am: 7bddc5a998 -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: I6b2de33adeec2ea771285910e411f494a841310e
tree: da3ee62e9867de1795f0708725b2dbebce7184c3
  1. Android.mk
  2. METADATA
  3. OWNERS
  4. cld80211-lib/
  5. qcwcn/