Merge "bootstat: Log factory_reset_boot_complete separately from ota_*."