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

Change-Id: If25fea9a0f7340a447aea8d688c829b7bd6ed4a4