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

Change-Id: Ic017653bdacd8921244c15f39ecdaf18aa10a440