Merge "Only show the thermal shutdown warning when thermal reboot" into qt-r1-dev am: 553b8bf2 am: 4c42353f am: 102d2136 Change-Id: I86d28a79761b49426c1a365d8c1e7c17c8be2d1c