Merge "Convert wifi hal test to use VtsHalHidlTargetTestEnvBase" am: 3690d19e68 am: 5000aa1605
am: 185ce8f252  -s ours

Change-Id: I66169c9d7a3edd10bee0e7152a3cda5f39b7a533