Merge "StatsCompanionService: register thermal event on all types" into qt-dev am: ab3e8c74c0
am: c1833d2165

Change-Id: I9591420539c5f747aecabe1602c99840f888885f