Merge "bootstat: Add Tj thermal shutdown" am: 49699fe895 am: 7909fe81dd

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1639920

Change-Id: Ie31981b9f1f24e9ae703943af98b94e6ec2dbba7