Merge "Revert "Create thermal apex"" am: deea9cdbe7 am: ed9c2785a0

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

Change-Id: I7744eac3ed22c1d76e877d9218d5441a517804df