Merge "Convert thermal hal test to use VtsHalHidlTargetTestEnvBase"