Merge "Put uptime into bugreport header"
am: 7938fa4bb0

Change-Id: I3826fdea80ad150f61261d1d8becb9d3a255aac1