Merge "bootstat: Add a few more bootreasons." am: b623389421
am: 6c640a1617

Change-Id: Ib8d59c37b86a6cc579c25080cd62b748c25aead9