Merge "Add owners to ThermalManagerService mocking tests" am: b51c532a58 am: b370f5ac98 am: 49c6dd680d

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

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