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

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