Merge "bootstat: Don\'t log time_since_factory_reset on device reset." am: f26207197e am: 15c0bf2a37
am: a48923246e

* commit 'a48923246e505cab36550840000686f957cb9559':
  bootstat: Don't log time_since_factory_reset on device reset.