Merge "bootstat: Fix false metrics due to soft reboots." am: bde89da5fc am: c5129582bb
am: 18d75b1ab3

Change-Id: I05d8cc087f648e6d8e22414e7d96a1385e1ac8e4