Merge "bootstat: Add more debug logging metrics to RecordFactoryReset." am: a347cde386
am: e94cbdf76e

* commit 'e94cbdf76e19cb2b7ee5b6bbf6b07f339b9efa6b':
  bootstat: Add more debug logging metrics to RecordFactoryReset.