Merge "Revert^2 "Create thermal apex"" am: 411e98d202 am: dc6d696c10

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

Change-Id: I051a48820dd3c6adf46e3f7c3d6a798d12b96aa5