Merge "bootstat: Add another boot reason." am: bb3769349d am: 90cde982dc
am: 92eca147c3

Change-Id: I88545e70f2e4342bf983ca48f3acacd4e783edf9