Merge "bootstat: test: refine reported test durations" am: bb52cbf35d
am: 9d00f0079d

Change-Id: If393cf4164f5cc5d24ac290c1258157f50da698e