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

Change-Id: Ib27dd0d695ecf43dfb781e0c8a3374b97b2ca15e