[automerger skipped] Merge "Merge Android R" am: 4285f3317f -s ours am: 0cc3b14b6d -s ours

am skip reason: Change-Id I1e02ed042efd096b4d664707cab17560adfa2de7 with SHA-1 e04942fc15 is in history

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

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