Merge "Store reason in case of userspace-reboot watchdog reboot" am: e53f8b8f9d am: 93823ce9df

Change-Id: Iac34b1d721bab27359724d10e847a65e1be36295