Merge "Update thermal file owner" into main am: 6da387677f am: a6afcf6979 am: 4f812bfabf

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2830554

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