Merge "bootstat: Disambiguate boot time on encrypted devices."
am: 42aab0a789

* commit '42aab0a789d6d2d602165e641ddc86a0bc2458c6':
  bootstat: Disambiguate boot time on encrypted devices.