Merge "Update thermal file owner" into main am: 6da387677f am: 6a8a8c2060

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

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