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

Change-Id: I43e99524c872574130cc3cac9c5ac5d537d9a6db