Merge "bootstat: Three more boot reasons." am: 5470a12513
am: 0a86c0c1ed

Change-Id: Ib67dd64ba4353cad68b270086101d16118e8072a