Merge "Revert^2 "Create thermal apex"" am: 411e98d202 am: dc6d696c10 am: 9911c86150 am: 66593bb178

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

Change-Id: Id5eac6be10925c7472b4b97e7b9d477e9efe2189