Merge "Enable FrameworksWifiApiTests to be part of android-mts-wifi as well as the full MTS." into mainline-prod