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

Change-Id: Idf5c69a6f861f1712fdc82b855e83bef46bac062