Merge "Merge "ThermalManagerServiceTest: change to new callback behavior" into...
Merge "Merge "ThermalManagerServiceTest: change to new callback behavior" into qt-dev am: adbdf2ef" into qt-dev-plus-aosp
am: f3523afa
Change-Id: Ief147cafb7733d83a66ce4b82b7b175cc88be4ed