Merge "Revert "frameworks/base/wifi/tests: Run mts-wifi on AOSP builds"" into rvc-dev am: b2c00e9e38

Change-Id: Ie86645ac6058dfc489acd8b49ee915e96490eee5
tree: 0fbc64652f0e81875103986c9b60712879e71564
  1. framework/
  2. OsuLogin/
  3. OWNERS