[automerger skipped] Merge "init: increase thermal shutdown timeout to 3s" into pi-dev
am: b94cc00943  -s ours

Change-Id: I84f134ab2f337bf33af23dc4345a8653f5422cd1