Merge "Remove dumpsys incidentd tests" into rvc-dev