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

Change-Id: I093eec686f4d7ed5474ed84014ce033fcc01d961