Merge "bootstat: system_boot_reason does not handle reboot_<reason> case" am: 0f058759b0
am: fc3f7ec5c3

Change-Id: Ifb12695091749ada0d8348555b04a85ca3385434