[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 1d60926081 -s ours
am: d8e43c7f9f

Change-Id: Ic1b4ec9ba080c39c1b0c08ebd3cfdef750a0e516
tree: e83a6bbe988bc6f6d6c0ca1003d760505670084b
  1. bcmdhd/
  2. .gitignore
  3. CleanSpec.mk