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

Change-Id: I380bf17e5edf0414dc13e83df49808158b0f685a