Merge "bootstat: Add four more boot reasons." am: 20a410b575
am: 9810df82a8

Change-Id: I1a437144425726921755978b07eb91cf463e28ab