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

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

Change-Id: I473cafcde37053cb2dc8e453dfbbedec806e59b2