Merge "Enable dumpsys package in incidentd"