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

Change-Id: I534437d1910278f2bb5c3c04417c0e8817c2dba9