Merge "bootstat: Add more boot reasons." am: 4aba23831d am: bb69ab2010
am: 020dcbc20f

Change-Id: Iabe2e177c580f42f655b63f4b52c905542d33c27