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