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

Change-Id: Id8ab908b71dce1e196f4a414c4064706c1318425