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

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

Change-Id: Id1de6faca8f938417efac69e006f544b1978ba52