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

Change-Id: Id5dd60d462fff10deecefd6dbf709fb463a7784a