Merge "bootstat: crash when parsing ro.boot.boottime"
am: c1fd33546e

Change-Id: I21ceeb95872cf5af1b26c5395df050ab5bf51ca5