Merge "Only show the thermal shutdown warning when thermal reboot" into qt-r1-dev am: 553b8bf2c1
am: d9baadcf15

Change-Id: If0131a57a298b166e44d4b37157b28c5f1eafbc0