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

Change-Id: I1054febb3608368b7166916e15c7ee49840a6791