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

Change-Id: Ia5903a912e540e1549ac43058d36564e22a91330