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

Change-Id: I115c593e6e71bf8597d790d85921d66d40792a1a