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

Change-Id: I908178abf95cd8e2997c9eabe42a05547f25e820