Merge "bootstat: Add more boot reasons." am: b91021a2a8
am: 14079b588c

Change-Id: I19d23065992ebeaf9950c173fc9ce61886bcffb2