Merge "Update thermal file owner" into main am: 6da38767 am: 6a8a8c20 am: b10da55d

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



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