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

Change-Id: I4c49fff20f78e4bff744dfe94a7207cf7e151404