Merge "bootstat: Don't log time_since_factory_reset on device reset."