Merge "Revert "Create thermal apex"" am: deea9cdbe7 am: ed9c2785a0 am: f482576ab7 am: 6f48fb4f76

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

Change-Id: Icc544f90dd4a9acf4c1203888624dbf4c5f813e8