Merge "Merge "frameworks/base/wifi/tests: Run mts-wifi on AOSP builds" into...

Merge "Merge "frameworks/base/wifi/tests: Run mts-wifi on AOSP builds" into rvc-dev am: 9c493f47 am: 7c107291 am: a73e86d4 am: c62c8f8d" into rvc-qpr-dev-plus-aosp am: fc86f321

Change-Id: Ic3a0f53b19c50d19cda328c16816649f5fef55c2