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

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

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