Merge "Make android.hardware.thermal HAL optional" am: e47d1c9ebb am: ff3380de7a am: d8cccc6e3b

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

Change-Id: I8bc5e1337796d1412032cb9d606bfe19029ed867
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>