[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 180ce9e724 -s ours
am: fe8fc84b59

Change-Id: Ie2bbf5da3eb772c73a934290beb0172fc10b545c
tree: 09a382c89d58ac170687b86f24f3ebc3f80698b6
  1. cld80211-lib/
  2. qcwcn/
  3. Android.mk
  4. OWNERS