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