[automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: 180ce9e724 -s ours am: fe8fc84b59 am: fb336e9956
am: 9c8f60bf44 -s ours
am skip reason: subject contains skip directive

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