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

Change-Id: I4f9311ba3c3fc473ec2f0666508af8e05038250e