Merge "Revert "frameworks/base/wifi/tests: Run mts-wifi on AOSP builds"" into rvc-dev am: 5d1cb4fe1e am: 0c9c65dfe1 am: e9dc80ede9 am: f1c64a2007

Change-Id: Ic0f904cfd69d3477364ecd3d541f83a6c04c6fa4