Merge "Add text dumpsys section to incidentd" into rvc-dev am: 5bbfd65359 am: 0610dbeb9f

Change-Id: I73d4677e803ce3b6089ec54fbee4f7b0f82d040e