Merge "bootstat: Log factory_reset_boot_complete separately from ota_*." am: 45d0cbf00b
am: 9fb006b57a

Change-Id: Ie19ee731bfc9f7927ed70409524dec081c8a001b