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

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