Merge "Convert VtsHalWifiOffloadV1_0TargetTest to be parameterized test" am: 6c4ab0203b am: ea8639e604
am: 7d5220b3d7

Change-Id: I34692cfc87047bc8fe6065c13e9ceae3bf4b6b4e