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

Change-Id: Iba554a7e22ba4dc657b62d5f702d556b893a3698