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

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



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