Merge "Convert VtsHalThermalV*TargetTest to be parameterized test" am: 11c4534f3f am: 73305eb795
am: 704dea818b

Change-Id: I68958eee5ee787b64287797f97c480d95b946921