Fix the Thermal AIDL example and VTS test am: d43e87345f am: 4fdf31bef1 am: c707d8214a

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2425231

Change-Id: I0584786524f5d3ab4049494dbbad3462c0a13e14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>