Merge "Fix incidentd skip collecting timedout of a section." into pi-dev am: 0f0c9243be
am: dce1c9fa91

Change-Id: Ifd36ca77c0a3031a4be2a8ff9985831c0440e7d7