Merge "IThermalManagerTest: fix double-owned" am: 50ad842007 am: 898dacf74d

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

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