[automerger skipped] Merge "CTS: Split Wifi tests out of CtsNetTestCases" am: 7f922c9ccd am: 7a002a1c59 -s ours am: ecd934feff -s ours
am skip reason: Change-Id Iaa51f7ec86e6b4bfe64dcb26a8d8b818dd356608 with SHA-1 9db13f3b26 is in history
Change-Id: Ie69c2df555d5513d7d2092934fb9b430bf645385
This commit is contained in: