Merge "Convert thermal hal test to use VtsHalHidlTargetTestEnvBase" am: 118f90b3b2
am: 3be1fe99cb

Change-Id: Ice861234f1ac1ff2830e60ab2adbc352ad9939d3