Merge "Implement dumpsys for incident service"