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

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

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