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

Change-Id: Ia950aa0a8e9f577b6f97ffff60f16b1ac1be73a7