Merge "Merge "Only show the thermal shutdown warning when thermal reboot" into qt-r1-dev am: 553b8bf2 am: d9baadcf" into qt-qpr1-dev-plus-aosp