Merge "bootstat: Update boot reason property earlier" am: 575996837c
am: a3c0dd8444

Change-Id: I26769280760497c724e9826d63c03dca26cb2ca6