Merge "Convert wifi hal test to use VtsHalHidlTargetTestEnvBase" am: 3690d19e68
am: 5000aa1605

Change-Id: I6ee6f9a155d85bb92236a926254e959db255ee22