[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: e04942fc15 -s ours am: 757d6f2bf6 -s ours am: dc3c9cb488 -s ours

am skip reason: Change-Id I3ef9471c3daf6846f9e9ee56df2f57661d4ddb00 with SHA-1 5c074eb45f is in history

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

Change-Id: I696a7fe71a13f442af8b5289db1d48e699e7e74d
tree: bfb3960f0e76abe9eb757037e777e824f9e7150c
  1. bcmdhd/
  2. .gitignore
  3. CleanSpec.mk
  4. METADATA