[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 32fa4f2dc5 -s ours

am skip reason: Change-Id I7bc25bb7bd3bbfa255e399def0a786d3200bb737 with SHA-1 830cb6b349 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

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