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

Change-Id: Ic70bfa6f27ea80b6e100886457d1c856536e6a6e