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

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

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