Merge "Add @hide annotation to thermal AIDL interfaces"