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

Change-Id: I0c89f753ffce53ba2e1b8d03f65c839db1f5940e