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

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