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

Change-Id: Ibe70420486afcdfe779440aecbf544182f586cf2