Merge "Add an API to dump incident report for dumpstate" am: a11beeca12
am: af1f91a133

Change-Id: If72f5dbe140ea5746288204e0de5275087d7709d