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" into rvc-d1-dev am: 333fb6fa am: 420f1672
Change-Id: Iee1b539b8e255ccbbddbefdff8a016175818f2ec