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

Change-Id: Ia8192a54becde6c9793db0dbfa5eb89c31dacc3d