Merge "IThermalManagerTest: fix double-owned" am: 50ad8420 am: 898dacf7...

Merge "IThermalManagerTest: fix double-owned" am: 50ad8420 am: 898dacf7 am: e27e4e96 am: 0664c2dd am: 6c0b93c4

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2166125



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